diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-22 15:11:26 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-22 15:11:26 +0000 |
| commit | 5e44c2ba46e780552317dec29e3b51282dfd5696 (patch) | |
| tree | ce3ad8f5d8ea5384ded1c537979e392ebe1b0182 /qa/Dockerfile | |
| parent | 25bf8a36335fa281dc8fe56f355f3829ace703a5 (diff) | |
| download | gitlab-ce-5e44c2ba46e780552317dec29e3b51282dfd5696.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa/Dockerfile')
| -rw-r--r-- | qa/Dockerfile | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/qa/Dockerfile b/qa/Dockerfile index 7f236a25288..d3662d07a1d 100644 --- a/qa/Dockerfile +++ b/qa/Dockerfile @@ -1,9 +1,9 @@ ARG DOCKER_VERSION=20.10.14 ARG CHROME_VERSION=106 -ARG QA_BUILD_TARGET=qa +ARG QA_BUILD_TARGET=ee ARG RUBY_VERSION=2.7 -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 qa +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>" ENV DEBIAN_FRONTEND="noninteractive" @@ -39,10 +39,6 @@ RUN bundle config set --local without development \ && bundle install --retry=3 COPY ./config/initializers/0_inject_enterprise_edition_module.rb /home/gitlab/config/initializers/ -# Copy VERSION to ensure the COPY succeeds to copy at least one file since ee/app/models/license.rb isn't present in FOSS -# 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 VERSION ./ee/config/feature_flag[s] /home/gitlab/ee/config/feature_flags/ COPY ./config/feature_flags /home/gitlab/config/feature_flags COPY ./config/bundler_setup.rb /home/gitlab/config/ COPY ./lib/gitlab_edition.rb /home/gitlab/lib/ @@ -53,8 +49,13 @@ COPY ./qa /home/gitlab/qa ENTRYPOINT ["bin/test"] -# Add JH files when pass the parameter: `--build-arg QA_BUILD_TARGET=jhqa` -FROM qa AS jhqa +# Add ee files when passing the parameter: `--build-arg QA_BUILD_TARGET=ee` +FROM foss as ee +ONBUILD COPY ./ee/app/models/license.rb /home/gitlab/ee/app/models/ +ONBUILD COPY ./ee/config/feature_flags /home/gitlab/ee/config/feature_flags/ + +# Add JH files when passing the parameter: `--build-arg QA_BUILD_TARGET=jhqa` +FROM ee AS jhqa 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 |