diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-29 12:10:22 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-29 12:10:22 +0300 |
| commit | d26aaa28dd29eec768d01d9d5fd0b7b684e2bad9 (patch) | |
| tree | 49c0b9fc7b5a7a23b4a1ceb41d6317c49f001e1c /qa/gdk | |
| parent | 46ac076c8416c65a55eff96f87efa6014ae272f8 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa/gdk')
| -rw-r--r-- | qa/gdk/Dockerfile.gdk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/qa/gdk/Dockerfile.gdk b/qa/gdk/Dockerfile.gdk index 33deab8f78d..dbd1bd7eff4 100644 --- a/qa/gdk/Dockerfile.gdk +++ b/qa/gdk/Dockerfile.gdk @@ -97,8 +97,9 @@ RUN set -eux; \ (cd gitlab && git init . && git add --all && git commit --quiet -m "Init repository") &> /dev/null; \ gdk config set gitaly.skip_setup true \ && gdk config set workhorse.skip_setup true \ - && gdk config set gitlab_shell.skip_setup true; \ - make redis/redis.conf all \ + && gdk config set gitlab_shell.skip_setup true \ + && cp .tool-versions ./gitlab/ \ + && make redis/redis.conf all \ && gdk kill ENTRYPOINT [ "/home/gdk/entrypoint" ] |