Commit a555c948 authored by Jacob Vosmaer's avatar Jacob Vosmaer

Merge branch 'an-fix-broken-build' into 'master'

Don't fail if /home/git/repositories already exists in Gitaly container

See merge request gitlab-org/gitlab-workhorse!317
parents 6d126c83 c1bc1ed7
...@@ -9,7 +9,7 @@ verify: ...@@ -9,7 +9,7 @@ verify:
services: services:
- name: registry.gitlab.com/gitlab-org/build/cng/gitaly:latest - name: registry.gitlab.com/gitlab-org/build/cng/gitaly:latest
# Disable the hooks so we don't have to stub the GitLab API # Disable the hooks so we don't have to stub the GitLab API
command: ["bash", "-c", "mkdir /home/git/repositories && rm -rf /srv/gitlab-shell/hooks/* && exec /scripts/process-wrapper"] command: ["bash", "-c", "mkdir -p /home/git/repositories && rm -rf /srv/gitlab-shell/hooks/* && exec /scripts/process-wrapper"]
alias: gitaly alias: gitaly
variables: variables:
GITALY_ADDRESS: "tcp://gitaly:8075" GITALY_ADDRESS: "tcp://gitaly:8075"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment