summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Steinhardt <psteinhardt@gitlab.com>2021-11-15 07:59:21 +0100
committerPatrick Steinhardt <psteinhardt@gitlab.com>2021-11-15 07:59:21 +0100
commitd804a909053e2117bf6ab966024836df817083f5 (patch)
tree45e7d18fb4675a07102b758ed25c073e1a9cced6
parent9d8a14e5bac26ac5dd303d631583d3ed49f6e64c (diff)
downloadgitlab-shell-pks-gitaly-cng-latest.tar.gz
Fix usage of out-of-date Gitaly imagespks-gitaly-cng-latest
Our CI jobs and docker-compose pull in the "latest" tag of Gitaly. As it turns out though, "latest" is pointing to Gitaly v13.3.0-rc5, which is definitely not the latest versionat this point in time. This is because CNG was converted to not use the "latest" tag anymore, but instead to use a tag called "master" in gitlab-org/build/CNG!519. Fix this by using the new "master" tag instead.
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--docker-compose.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1110522..b1af527 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,7 +45,7 @@ default:
- go version
- which go
services:
- - name: registry.gitlab.com/gitlab-org/build/cng/gitaly:latest
+ - name: registry.gitlab.com/gitlab-org/build/cng/gitaly:master
# Disable the hooks so we don't have to stub the GitLab API
command: ["bash", "-c", "mkdir -p /home/git/repositories && rm -rf /srv/gitlab-shell/hooks/* && exec /usr/bin/env GITALY_TESTING_NO_GIT_HOOKS=1 /scripts/process-wrapper"]
alias: gitaly
diff --git a/docker-compose.yml b/docker-compose.yml
index 28ab3cf..fb87b24 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,6 +3,6 @@ services:
gitaly:
environment:
- GITALY_TESTING_NO_GIT_HOOKS=1
- image: registry.gitlab.com/gitlab-org/build/cng/gitaly:latest
+ image: registry.gitlab.com/gitlab-org/build/cng/gitaly:master
ports:
- '8075:8075'