Reintroduces the same changes as
https://github.com/sourcegraph/sourcegraph/pull/51104 minus
syntax-highlighter which we're unable to compile with the right
toolchain at the moment.
Tested as a full main-dry-run, as well as running the stack with compose
and checking indexing and syntax-highlighting.
Executors are also built correctly.
## Test plan
CI + manual test via compose.
---------
Co-authored-by: Jean-Hadrien Chabran <jh@chabran.fr>
For now, we disable this, because the latest release of curl on edge
segfaults on 3.14. We'll be releasing a fix before the patch release.
DRI: @jhchabran
## Test plan
<!-- All pull requests REQUIRE a test plan:
https://docs.sourcegraph.com/dev/background-information/testing_principles
-->
docker run + `wget` = no segfault.
# changes
- add p4 to the repo-updater Dockerfile
- bump the version of p4 from 21.2 to 22.2 for all Dockerfiles, and add
hash checking of the download
- enhance the Perforce VCSSyncer so that it captures the output of `p4
depots` and matches it to the given depot, returning errors if the given
depot doen't match any of the depots returned by `p4 depots`
- fill out `ListRepos` in the Perforce Source so that it calls the
Perforce VCSSyncer's IsCloneable, which checks the given depot agains
the depots from the Perforce server
# before and after videos
https://www.loom.com/share/73099aa7f0ec4427a564f07b80a19a46https://www.loom.com/share/b7d38469baab496ea50ab22bdfa256da
## Test plan
Add or edit a code host with purposefully wrong connection info; either
the host/port, the username, or the password. A warning message will
display (sometimes a timeout message displays instead) in the Manage
Code Host screen, and an error message will display in the list of code
hosts (sometimes have to wait for the next sync before that appears).
Add or modify a depot so that it is invalid. The repository count will
not increase, and an error message will display in the list of code
hosts. There's no error message in the Manage Code Hose screen, which
would be nice - fodder for iteration.
<!-- All pull requests REQUIRE a test plan:
https://docs.sourcegraph.com/dev/background-information/testing_principles
-->
---------
Co-authored-by: Thorsten Ball <mrnugget@gmail.com>
Co-authored-by: Indradhanush Gupta <indradhanush.gupta@gmail.com>
There is a new git vulnerability which may affect us since we do run
"git archive". Security scanners are not yet reporting this, but more
details can be found at
https://github.blog/2023-01-17-git-security-vulnerabilities-announced-2/
Note: alpine@edge is currently at 2.39.1-r1.
Test Plan: get CI to build images, pull them and confirm git version via
docker run --entrypoint=git IMAGE version
* bring back blob store PRs (#44991)
This reverts commit 5c5ccffbe0.
* blobstore: add missing env var
Signed-off-by: Stephen Gutekanst <stephen@sourcegraph.com>
* Update syntax-highlighter docker container
Context https://sourcegraph.slack.com/archives/C022SPMNR0W/p1663771635349499Fixes#41493
Previously, the single container deployment option used an old version
of our syntax highlighter causing several new features to no longer
work, including C# highligting and the new `"syntaxHighlighting"`
site-config section.
* change all instances of syntect to syntax_highlighter
* revert to syntect binary
* Update docker-images/syntax-highlighter/Dockerfile
Co-authored-by: Sander Ginn <sanderginn@users.noreply.github.com>
Co-authored-by: davejrt <davetry@gmail.com>
Co-authored-by: Sander Ginn <sanderginn@users.noreply.github.com>
* Revert "blobstore: build s3proxy from source ourselves; use our base alpine image (#44976)"
This reverts commit c5181d0696.
* Revert "cmd/server: remove minio support (default to blobstore) (#44979)"
This reverts commit e49509fa97.
* server: use sg/log for minio
We add the optional dependency git-lfs to any image gitserver may run
on. This is still an experimental feature, but is a requirement when
enabled.
Additionally we include it in the nix devenv since its cheap to add.
Note: git-lfs is a relatively small go binary and does not require
specific versions of git. Additionally git will not automatically use
it, so its presence will not change behaviour.
Test Plan: CI docker image dry run
We updated sourcegraph/alpine-3.14 today in 3b3879b9 to remove a bunch
of CVEs in bind-tools. This commit makes it so we use the new image.
Test Plan: CI works and has far less security reports.
We have a 3.14 image available, but when we introduced it we ran into problems
using it. This updates all images to use the newer version of alpine.
ruplacer --go \
sourcegraph/alpine-3.12:142406_2022-04-14_8836ac3499f4@sha256:4681a48d1fb9a73fef1b540c08b3411f797351bbeda749f5dca21213a1e71526 \
sourcegraph/alpine-3.14:142406_2022-04-14_8836ac3499f4@sha256:2a2d1cbaec78882661fe1aa5b0a4af0c23a37be2ea9ff8aadc2da5b80852c233
I also had to pin postgresql in the server image since we can't upgrade it
otherwise customer upgrades fail (incompatible on disk data). Additionally we
had to include libstc++ and libgcc for tree sitter.
Risks: I am relying on our CI to catch problems with this upgrade. The main
risks here are us not testing things which exercise non-go binaries that rely
on shared libraries. What comes to mind is things like p4 and tree-sitter, I
am unsure if they get properly exercised. However, I think now is a good time
to land a change like this since we have a lot of time until branch cut.
Test Plan: main dry run on CI to test docker image building and integration
testing.
