From ba38efc291ab64a1671bc3d7c2cf13d8228fad72 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Fri, 17 Jan 2020 06:55:15 -0800 Subject: [PATCH] Use Ruby 2.6 for gitlab-qa image Rename the image so that it doesn't break gitlab-qa builds, since Rubocop will need to be updated. --- .gitlab-ci.yml | 4 ++-- Dockerfile.gitlab-qa => Dockerfile.gitlab-qa-ruby-2.6 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename Dockerfile.gitlab-qa => Dockerfile.gitlab-qa-ruby-2.6 (96%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bc2b2de..58d5fdc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -88,7 +88,7 @@ alpine-aws test: *test_build alpine-helm test: *test_build ruby-alpine-aws test: *test_build gitlab-charts-build-base test: *test_build -gitlab-qa test: *test_build +gitlab-qa-ruby-2.6 test: *test_build gitlab-qa-alpine test: *test_build gitlab-puppeteer test: *test_build omnibus-gitlab-bionic test: *test_build @@ -149,7 +149,7 @@ alpine-aws: *build_and_deploy alpine-helm: *build_and_deploy ruby-alpine-aws: *build_and_deploy gitlab-charts-build-base: *build_and_deploy -gitlab-qa: *build_and_deploy +gitlab-qa-ruby-2.6: *build_and_deploy gitlab-qa-alpine: *build_and_deploy gitlab-puppeteer: *build_and_deploy omnibus-gitlab-bionic: *build_and_deploy diff --git a/Dockerfile.gitlab-qa b/Dockerfile.gitlab-qa-ruby-2.6 similarity index 96% rename from Dockerfile.gitlab-qa rename to Dockerfile.gitlab-qa-ruby-2.6 index a359702..b9519d1 100644 --- a/Dockerfile.gitlab-qa +++ b/Dockerfile.gitlab-qa-ruby-2.6 @@ -1,4 +1,4 @@ -FROM ruby:2.4 +FROM ruby:2.6 # Enable support for UTF encoded stdin/stdout