artin/sourcegraph
1
0
Fork 0
mirror of https://github.com/sourcegraph/sourcegraph.git synced 2026-02-06 18:51:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

gitserver: bump git to >=2.30 (#28668)

Browse Source 
This udpates gitserver and server images with newer versions of git and git-p4. We
want to use git>=2.30 to experiment with git maintenance.
This commit is contained in:
Stefan Hengl 2021-12-10 14:50:11 +01:00 committed by GitHub
parent da9fcc21ef
commit 9d7fd1055e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/gitserver/Dockerfile
View File

@ -32,10 +32,11 @@ LABEL com.sourcegraph.github.url=https://github.com/sourcegraph/sourcegraph/comm
# hadolint ignore=DL3018
RUN apk add --no-cache \
# Gitserver requires Git protocol v2 https://github.com/sourcegraph/sourcegraph/issues/13168
'git>=2.18' \
openssh-client \
# We require git>=2.30 because we use git maintenance.
'git>=2.30' --repository=http://dl-cdn.alpinelinux.org/alpine/v3.15/main \
git-p4 \
&& apk add --no-cache \
openssh-client \
python2 \
python3

10
cmd/server/Dockerfile
View File

@ -33,16 +33,18 @@ LABEL org.opencontainers.image.version=${VERSION}
LABEL com.sourcegraph.github.url=https://github.com/sourcegraph/sourcegraph/commit/${COMMIT_SHA}
# hadolint ignore=DL3018
RUN apk update && apk add --no-cache --verbose \
RUN apk add --no-cache --verbose \
# We require git>=2.30 because we use git maintenance.
'git>=2.30' \
git-p4 \
--repository=http://dl-cdn.alpinelinux.org/alpine/v3.15/main \
# NOTE that the Postgres version we run is different
# from our *Minimum Supported Version* which alone dictates
# the features we can depend on. See this link for more information:
# https://github.com/sourcegraph/sourcegraph/blob/main/doc/dev/postgresql.md#version-requirements
&& apk add --no-cache --verbose \
'bash=5.0.17-r0' \
'redis=~5.0' \
# Gitserver requires Git protocol v2 https://github.com/sourcegraph/sourcegraph/issues/13168
'git>=2.18' \
git-p4 \
python2 \
python3 \
'nginx>=1.18.0' openssh-client pcre sqlite-libs su-exec 'nodejs-current=14.5.0-r0' \