diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-19 14:01:45 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-19 14:01:45 +0300 |
commit | 9297025d0b7ddf095eb618dfaaab2ff8f2018d8b (patch) | |
tree | 865198c01d1824a9b098127baa3ab980c9cd2c06 /qa/Dockerfile | |
parent | 6372471f43ee03c05a7c1f8b0c6ac6b8a7431dbe (diff) |
Add latest changes from gitlab-org/gitlab@16-7-stable-eev16.7.0-rc42
Diffstat (limited to 'qa/Dockerfile')
-rw-r--r-- | qa/Dockerfile | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/qa/Dockerfile b/qa/Dockerfile index 92866ec66cc..1a6a670bf96 100644 --- a/qa/Dockerfile +++ b/qa/Dockerfile @@ -1,7 +1,7 @@ -ARG DOCKER_VERSION=20.10.14 -ARG CHROME_VERSION=106 -ARG QA_BUILD_TARGET=ee +ARG DOCKER_VERSION=24.0.5 +ARG CHROME_VERSION=113 ARG RUBY_VERSION=3.0 +ARG QA_BUILD_TARGET=ee FROM registry.gitlab.com/gitlab-org/gitlab-build-images/debian-bullseye-ruby-${RUBY_VERSION}:bundler-2.3-git-2.36-lfs-2.9-chrome-${CHROME_VERSION}-docker-${DOCKER_VERSION}-gcloud-383-kubectl-1.23 AS foss LABEL maintainer="GitLab Quality Department <quality@gitlab.com>" @@ -70,4 +70,9 @@ ONBUILD COPY ./jh/qa /home/gitlab/jh/qa ONBUILD COPY ./jh/lib /home/gitlab/jh/lib ONBUILD COPY ./jh/config/feature_flags /home/gitlab/jh/config/feature_flags +# Add solargraph gem for devcontainer +# Solargraph is only present in parent Gemfile so we just install it manually +FROM ee as dev +RUN gem install solargraph --force + FROM $QA_BUILD_TARGET |