Merge branch '68-avoid-stretch-in-ruby-images' into 'master'

Avoid to use stretch image in Ruby 2.6-base images

Closes #68

See merge request gitlab-org/gitlab-build-images!383
This commit is contained in:
Stan Hu 2021-03-15 17:58:17 +00:00
commit 59cbeda30f

View file

@ -211,9 +211,6 @@ function print_pgbouncer_args() {
function print_ruby_args() { function print_ruby_args() {
case "$1" in case "$1" in
2.6|2.6.*) 2.6|2.6.*)
# 2.6 requires older version of debian
CUSTOM_IMAGE_NAME=debian
CUSTOM_IMAGE_VERSION=stretch
RUBY_VERSION="2.6.6" RUBY_VERSION="2.6.6"
RUBY_DOWNLOAD_SHA256="364b143def360bac1b74eb56ed60b1a0dca6439b00157ae11ff77d5cd2e92291" RUBY_DOWNLOAD_SHA256="364b143def360bac1b74eb56ed60b1a0dca6439b00157ae11ff77d5cd2e92291"
;; ;;