Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

Bump up included git version #47892

Merged
evict merged 2 commits into from
Feb 20, 2023
Merged

Bump up included git version #47892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b75f13b
update included git version
Feb 20, 2023
fc327ed
edge/main version of git
Feb 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cmd/gitserver/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ LABEL org.opencontainers.image.version=${VERSION}
LABEL com.sourcegraph.github.url=https://github.com/sourcegraph/sourcegraph/commit/${COMMIT_SHA}

RUN apk add --no-cache \
# We require git 2.39.1+ because we need a fix for this vulnerability to be included:
# https://github.blog/2023-01-17-git-security-vulnerabilities-announced-2/
'git>=2.39.1-r1' --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main \
# Minimal version requirement to address vulnerabilities
# https://github.blog/2023-02-14-git-security-vulnerabilities-announced-3/
'git>=2.39.2-r0' --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main \
git-lfs \
git-p4 \
&& apk add --no-cache \
Expand Down
7 changes: 3 additions & 4 deletions cmd/server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,9 @@ LABEL org.opencontainers.image.version=${VERSION}
LABEL com.sourcegraph.github.url=https://github.com/sourcegraph/sourcegraph/commit/${COMMIT_SHA}

RUN apk add --no-cache --verbose \
# [NOTE: git-version-min-requirement]
# We require git 2.39.1+ because we need a fix for this vulnerability to be included:
# https://github.blog/2023-01-17-git-security-vulnerabilities-announced-2/
'git>=2.39.1-r1' --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main \
# Minimal version requirement to address vulnerabilities
# https://github.blog/2023-02-14-git-security-vulnerabilities-announced-3/
'git>=2.39.2-r0' --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main \
git-lfs \
git-p4 \
--repository=http://dl-cdn.alpinelinux.org/alpine/v3.17/main \
Expand Down
6 changes: 3 additions & 3 deletions enterprise/cmd/batcheshelper/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ LABEL org.opencontainers.image.version=${VERSION}
LABEL com.sourcegraph.github.url=https://github.com/sourcegraph/sourcegraph/commit/${COMMIT_SHA}

RUN apk add --no-cache \
# We require git 2.39.1+ because we need a fix for this vulnerability to be included:
# https://github.blog/2023-01-17-git-security-vulnerabilities-announced-2/
'git>=2.39.1-r1' --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
# Minimal version requirement to address vulnerabilities
# https://github.blog/2023-02-14-git-security-vulnerabilities-announced-3/
'git>=2.39.2-r0' --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main

COPY batcheshelper /usr/local/bin/
6 changes: 3 additions & 3 deletions enterprise/cmd/executor/docker-image/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ ENV EXECUTOR_USE_FIRECRACKER=false

# Install git and docker. We use the same version here as we use in gitserver.
RUN apk add --no-cache \
# We require git 2.39.1+ because we need a fix for this vulnerability to be included:
# https://github.blog/2023-01-17-git-security-vulnerabilities-announced-2/
'git>=2.39.1-r1' --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main \
# Minimal version requirement to address vulnerabilities
# https://github.blog/2023-02-14-git-security-vulnerabilities-announced-3/
'git>=2.39.2-r0' --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main \
docker \
ca-certificates

Expand Down
7 changes: 4 additions & 3 deletions enterprise/cmd/gitserver/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,10 @@ LABEL org.opencontainers.image.version=${VERSION}
LABEL com.sourcegraph.github.url=https://github.com/sourcegraph/sourcegraph/commit/${COMMIT_SHA}

RUN apk add --no-cache \
# We require git 2.39.1+ because we need a fix for this vulnerability to be included:
# https://github.blog/2023-01-17-git-security-vulnerabilities-announced-2/
'git>=2.39.1-r1' --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main \
# backported fix for 3.14 https://security.alpinelinux.org/vuln/CVE-2023-22490
# Minimal version requirement to address vulnerabilities
# https://github.blog/2023-02-14-git-security-vulnerabilities-announced-3/
'git>=2.39.2-r0' --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main \
git-lfs \
git-p4 \
&& apk add --no-cache \
Expand Down