diff options
Diffstat (limited to 'qa/Dockerfile')
| -rw-r--r-- | qa/Dockerfile | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/qa/Dockerfile b/qa/Dockerfile index 4fd44ba02df..5d046636984 100644 --- a/qa/Dockerfile +++ b/qa/Dockerfile @@ -1,8 +1,12 @@ -FROM registry.gitlab.com/gitlab-org/gitlab-build-images/debian-bullseye-ruby-2.7:bundler-2.3-git-2.33-lfs-2.9-chrome-99-docker-20.10.14-gcloud-383-kubectl-1.23 +ARG DOCKER_VERSION=20.10.14 +ARG CHROME_VERSION=101 + +FROM registry.gitlab.com/gitlab-org/gitlab-build-images/debian-bullseye-ruby-2.7:bundler-2.3-git-2.33-lfs-2.9-chrome-${CHROME_VERSION}-docker-${DOCKER_VERSION}-gcloud-383-kubectl-1.23 LABEL maintainer="GitLab Quality Department <quality@gitlab.com>" -ENV DEBIAN_FRONTEND="noninteractive" \ - BUNDLE_WITHOUT=development +ENV DEBIAN_FRONTEND="noninteractive" +# Override config path to make sure local config doesn't override it when building image locally +ENV BUNDLE_APP_CONFIG=/home/gitlab/.bundle ## # Install system libs @@ -27,7 +31,8 @@ WORKDIR /home/gitlab/qa # Install qa dependencies or fetch from cache if unchanged # COPY ./qa/Gemfile* /home/gitlab/qa/ -RUN bundle install --jobs=$(nproc) --retry=3 +RUN bundle config set --local without development \ + && bundle install --retry=3 ## # Fetch chromedriver based on version of chrome @@ -42,6 +47,7 @@ COPY ./config/initializers/0_inject_enterprise_edition_module.rb /home/gitlab/co # The [b] part makes ./ee/app/models/license.r[b] a pattern that is allowed to return no files (which is the case in FOSS) COPY VERSION ./ee/app/models/license.r[b] /home/gitlab/ee/app/models/ COPY ./config/bundler_setup.rb /home/gitlab/config/ +COPY ./config/feature_flags /home/gitlab/config/feature_flags COPY ./lib/gitlab_edition.rb /home/gitlab/lib/ COPY ./lib/gitlab/utils.rb /home/gitlab/lib/gitlab/ COPY ./INSTALLATION_TYPE ./VERSION /home/gitlab/ |