NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-09 10:02:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'update-qa-ruby-version' into 'master'

Browse source 
Use Ruby version postfix for gitlab-qa-alpine

See merge request gitlab-org/gitlab-build-images!268
This commit is contained in:
Rémy Coutable 2020-01-31 16:22:52 +00:00
commit d3eb7a28cb
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -89,7 +89,7 @@ alpine-helm test: *test_build
ruby-alpine-aws test: *test_build
gitlab-charts-build-base test: *test_build
gitlab-qa-ruby-2.6 test: *test_build
gitlab-qa-alpine test: *test_build
gitlab-qa-alpine-ruby-2.6 test: *test_build
gitlab-puppeteer test: *test_build
omnibus-gitlab-bionic test: *test_build
omnibus-gitlab-centos6 test: *test_build
@ -150,7 +150,7 @@ alpine-helm: *build_and_deploy
ruby-alpine-aws: *build_and_deploy
gitlab-charts-build-base: *build_and_deploy
gitlab-qa-ruby-2.6: *build_and_deploy
gitlab-qa-alpine: *build_and_deploy
gitlab-qa-alpine-ruby-2.6: *build_and_deploy
gitlab-puppeteer: *build_and_deploy
omnibus-gitlab-bionic: *build_and_deploy
omnibus-gitlab-centos6: *build_and_deploy

2
Dockerfile.gitlab-qa-alpine → Dockerfile.gitlab-qa-alpine-ruby-2.6
View file

@ -3,7 +3,7 @@
# - Nightly QA: https://gitlab.com/gitlab-org/quality/nightly/blob/master/.gitlab-ci.yml
# - Staging QA: https://gitlab.com/gitlab-org/quality/staging/blob/master/.gitlab-ci.yml
FROM ruby:2.6.3-alpine
FROM ruby:2.6-alpine
MAINTAINER GitLab Quality Team
WORKDIR /home/qa