Merge pull request #2674 from sachilles/upgrade-to-15.5.6

Upgrade to GitLab CE 15.5.6
This commit is contained in:
Steven Achilles 2022-12-10 13:36:52 +01:00 committed by GitHub
commit ff7394c681
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 5 deletions

View File

@ -2,6 +2,14 @@
This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
**15.5.6**
- gitlab: upgrade CE to v15.5.6
- gitaly: upgrade to v15.5.6
- golang: upgrade to v1.18.9
- ruby: upgrade to v2.7.7
- ubuntu: upgrade to focal-20221019
**15.5.5**
- gitlab: upgrade CE to v15.5.5

View File

@ -1,11 +1,11 @@
FROM ubuntu:focal-20221019
FROM ubuntu:focal-20221130
ARG VERSION=15.5.5
ARG VERSION=15.5.6
ENV GITLAB_VERSION=${VERSION} \
RUBY_VERSION=2.7.6 \
RUBY_SOURCE_SHA256SUM="e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10" \
GOLANG_VERSION=1.17.13 \
RUBY_VERSION=2.7.7 \
RUBY_SOURCE_SHA256SUM="e10127db691d7ff36402cfe88f418c8d025a3f1eea92044b162dd72f0b8c7b90" \
GOLANG_VERSION=1.18.9 \
GITLAB_SHELL_VERSION=14.12.0 \
GITLAB_PAGES_VERSION=1.62.0 \
GITALY_SERVER_VERSION=15.5.5 \

View File

@ -78,6 +78,7 @@ exec_as_git git config --global gc.auto 0
exec_as_git git config --global repack.writeBitmaps true
exec_as_git git config --global receive.advertisePushOptions true
exec_as_git git config --global advice.detachedHead false
exec_as_git git config --global --add safe.directory /home/git/gitlab
# shallow clone gitlab-foss
echo "Cloning gitlab-foss v.${GITLAB_VERSION}..."
@ -122,6 +123,7 @@ rm -rf ${GITLAB_HOME}/repositories
# build gitlab-workhorse
echo "Build gitlab-workhorse"
git config --global --add safe.directory /home/git/gitlab
make -C ${GITLAB_WORKHORSE_BUILD_DIR} install
# clean up
rm -rf ${GITLAB_WORKHORSE_BUILD_DIR}