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 'mk-ruby-3.0.5' into 'master'

Browse source 
Update Ruby 2.7 and 3.x images

See merge request https://gitlab.com/gitlab-org/gitlab-build-images/-/merge_requests/612

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Stan Hu <stanhu@gmail.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: Matthias Kaeppler <mkaeppler@gitlab.com>
This commit is contained in:
Balasankar 'Balu' C 2022-11-29 14:49:45 +00:00
commit c302987b3c
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile.gitlab-charts-build-base-helm-3.7
View file

@ -1,4 +1,4 @@
FROM ruby:2.7.6-alpine
FROM ruby:2.7.7-alpine
MAINTAINER GitLab Distribution Team
ENV HELM_VERSION=3.7.2

2
Dockerfile.www-gitlab-com-debian-bullseye-ruby-3.0-node-16
View file

@ -1,6 +1,6 @@
FROM gcr.io/google.com/cloudsdktool/cloud-sdk as gcloud-sdk
FROM ruby:3.0.4-slim-bullseye
FROM ruby:3.0.5-slim-bullseye
# Install Google Cloud SDK for deploys via rsync
COPY --from=gcloud-sdk /usr/lib/google-cloud-sdk /usr/lib/google-cloud-sdk

8
scripts/lib/custom-docker-build
View file

@ -217,8 +217,8 @@ function print_ruby_args() {
;;
2.7|2.7.patched)
RUBY_VERSION="2.7.6"
RUBY_DOWNLOAD_SHA256="e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10"
RUBY_VERSION="2.7.7"
RUBY_DOWNLOAD_SHA256="e10127db691d7ff36402cfe88f418c8d025a3f1eea92044b162dd72f0b8c7b90"
;;
# Please update any clients still asking for these images to request `ruby-2.7` instead,
@ -229,8 +229,8 @@ function print_ruby_args() {
;;
3.0|3.0.patched)
RUBY_VERSION="3.0.4"
RUBY_DOWNLOAD_SHA256="70b47c207af04bce9acea262308fb42893d3e244f39a4abc586920a1c723722b"
RUBY_VERSION="3.0.5"
RUBY_DOWNLOAD_SHA256="9afc6380a027a4fe1ae1a3e2eccb6b497b9c5ac0631c12ca56f9b7beb4848776"
;;
*) fail "Unknown ruby version $1" ;;