diff options
Diffstat (limited to 'qa/gdk/Dockerfile.gdk')
| -rw-r--r-- | qa/gdk/Dockerfile.gdk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/qa/gdk/Dockerfile.gdk b/qa/gdk/Dockerfile.gdk index 829ebecd4ee..9326beba93f 100644 --- a/qa/gdk/Dockerfile.gdk +++ b/qa/gdk/Dockerfile.gdk @@ -1,11 +1,11 @@ -FROM registry.gitlab.com/gitlab-org/gitlab-development-kit/asdf-bootstrapped-verify:main@sha256:66bf41314b7f3bb65ec671f3b2f8d59e1d6de9d2dc0b2daf72aa03a950c75549 as base +FROM registry.gitlab.com/gitlab-org/gitlab-development-kit/asdf-bootstrapped-verify:main@sha256:fb833ce8f838e38104ee3b499a99f86e7a5844a4d4d8fdeeababd2d717504f3e as base ENV GITLAB_LICENSE_MODE=test \ GDK_KILL_CONFIRM=true # Clone GDK at specific sha and bootstrap packages # -ARG GDK_SHA=9756ad259ec0ed356f49ed22678e2f13252b3f4f +ARG GDK_SHA=65cf4576208b9f79c54c0042c44024c0008deafc RUN set -eux; \ git clone --depth 1 https://gitlab.com/gitlab-org/gitlab-development-kit.git && cd gitlab-development-kit; \ git fetch --depth 1 origin ${GDK_SHA} && git -c advice.detachedHead=false checkout ${GDK_SHA}; \ @@ -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" ] |