diff options
| author | Ash McKenzie <amckenzie@gitlab.com> | 2021-11-16 03:26:58 +0000 |
|---|---|---|
| committer | Ash McKenzie <amckenzie@gitlab.com> | 2021-11-16 03:26:58 +0000 |
| commit | 31901e0d6c2b863ad93199c8a93a7c2ce0923c60 (patch) | |
| tree | 27bfae2f21e14610deb3778a616acedc71f7887b | |
| parent | b1c1e5fa06b31cca25799da3b42e97b5f71dbbac (diff) | |
| parent | d804a909053e2117bf6ab966024836df817083f5 (diff) | |
| download | gitlab-shell-31901e0d6c2b863ad93199c8a93a7c2ce0923c60.tar.gz | |
Merge branch 'pks-gitaly-cng-latest' into 'main'
Fix usage of out-of-date Gitaly images
See merge request gitlab-org/gitlab-shell!544
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | docker-compose.yml | 2 |
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' |