diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3a12c6c2c418b2907129aea59c56e26f15fe1696..21e94875d63c23a2a4e1eabf395c4fa4ada21e35 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ variables: # https://gitlab.com/gitlab-org/release/docs/blob/master/general/deploy/auto-deploy.md#auto-deploy-tagging AUTO_DEPLOY_TAG_REGEX: '^[0-9]+\.[0-9]+\.[0-9]+\+[a-z0-9]{7,}$' AUTO_DEPLOY_BRANCH_REGEX: '^[0-9]+-[0-9]+-auto-deploy-[0-9]+$' - RUBY_VERSION: 2.7.2 + RUBY_VERSION: 2.7.4 # Suffix to the cache key of gitlab-rails-* where Gem vendor bundles are stored. Enables easy cache busting. RAILS_CACHE_SUFFIX: 20201123 DNF_OPTS: '--disableplugin=subscription-manager' diff --git a/gitlab-ruby/Dockerfile b/gitlab-ruby/Dockerfile index b2484955df591a8bea3661e4b953c07c36f2d1e1..bfea9ee6685ce76b4d56d1f63a488466e16226a4 100644 --- a/gitlab-ruby/Dockerfile +++ b/gitlab-ruby/Dockerfile @@ -2,7 +2,7 @@ FROM debian:buster-slim ARG BUILD_DIR=/tmp/build ARG RUBY_MAJOR_VERSION=2.7 -ARG RUBY_MINOR_VERSION=2.7.2 +ARG RUBY_MINOR_VERSION=2.7.4 ARG RUBYGEMS_VERSION=3.2.19 ARG BUNDLER_VERSION=2.2.19 ARG JEMALLOC_VERSION=5.2.1 diff --git a/gitlab-ruby/Dockerfile.build.ubi8 b/gitlab-ruby/Dockerfile.build.ubi8 index 825c3f811b0c31fff183698819ebf2bafa5cb978..ea05321f8a8f894ad6fb2d66cab0bd7afdc757d6 100644 --- a/gitlab-ruby/Dockerfile.build.ubi8 +++ b/gitlab-ruby/Dockerfile.build.ubi8 @@ -3,7 +3,7 @@ ARG BUILD_IMAGE= FROM ${BUILD_IMAGE} ARG RUBY_MAJOR_VERSION=2.7 -ARG RUBY_MINOR_VERSION=2.7.2 +ARG RUBY_MINOR_VERSION=2.7.4 ARG RUBYGEMS_VERSION=3.2.19 ARG BUNDLER_VERSION=2.2.19 ARG RBREADLINE_VERSION=0.5.5