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

Add Ruby 3.2 version of www-gitlab-com Docker image

Browse source
This commit is contained in:
Evan Read 2023-03-06 05:54:13 +00:00 • committed by Balasankar 'Balu' C
parent 1f51a02893
commit b5cc37433d
4 changed files with 28 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitlab/ci/custom.images.yml
View file

@ -28,6 +28,9 @@ ubi-release:
www-gitlab-com-debian-bullseye-ruby-3.0-node-16: www-gitlab-com-debian-bullseye-ruby-3.0-node-16:
extends: .build_static_image extends: .build_static_image
www-gitlab-com-debian-bullseye-ruby-3.2-node-18:
extends: .build_static_image
build-git: build-git:
extends: .build_static_image extends: .build_static_image

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

@ -14,7 +14,7 @@ RUN cd /usr/bin && find ../lib/google-cloud-sdk/bin -type f -executable -exec ln
ADD /scripts/ /scripts/ ADD /scripts/ /scripts/
ADD /patches /patches/ ADD /patches /patches/
RUN /scripts/install-www-gitlab-com RUN NODE_INSTALL_VERSION=16.19.1 /scripts/install-www-gitlab-com
# Set UTF-8 http://jaredmarkell.com/docker-and-locales/ # Set UTF-8 http://jaredmarkell.com/docker-and-locales/
# Must be set after install-essentials is run # Must be set after install-essentials is run

23
Dockerfile.www-gitlab-com-debian-bullseye-ruby-3.2-node-18 Normal file
View file

@ -0,0 +1,23 @@
ARG GCLOUD_VERSION=413.0.0
# Google-cloud-sdk
#
# gsutil 5.18 unnecessarily requires the storage.buckets.get
# permission: https://github.com/GoogleCloudPlatform/gsutil/issues/1663
FROM gcr.io/google.com/cloudsdktool/cloud-sdk:$GCLOUD_VERSION as gcloud-sdk
FROM ruby:3.2.1-slim-bullseye
# Install Google Cloud SDK for deploys via rsync
COPY --from=gcloud-sdk /usr/lib/google-cloud-sdk /usr/lib/google-cloud-sdk
COPY --from=gcloud-sdk /usr/share/google-cloud-sdk /usr/share/google-cloud-sdk
RUN cd /usr/bin && find ../lib/google-cloud-sdk/bin -type f -executable -exec ln -s {} \;; cd -
ADD /scripts/ /scripts/
ADD /patches /patches/
RUN NODE_INSTALL_VERSION=18.14.2 /scripts/install-www-gitlab-com
# Set UTF-8 http://jaredmarkell.com/docker-and-locales/
# Must be set after install-essentials is run
ENV LANG C.UTF-8
ENV LANGUAGE C
ENV LC_ALL C.UTF-8

3
scripts/install-www-gitlab-com
View file

@ -20,9 +20,8 @@ function build_debian() {
apt-get install -yq --no-install-recommends imagemagick apt-get install -yq --no-install-recommends imagemagick
# Install node & yarn # Install node & yarn
NODE_INSTALL_VERSION=16.14.2
YARN_INSTALL_VERSION=1.22.19 YARN_INSTALL_VERSION=1.22.19
/scripts/install-node $NODE_INSTALL_VERSION $YARN_INSTALL_VERSION && node --version && yarn --version /scripts/install-node "$NODE_INSTALL_VERSION $YARN_INSTALL_VERSION" && node --version && yarn --version
# Install gitlab-runner # Install gitlab-runner
curl -O -J -L "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/latest/binaries/gitlab-ci-multi-runner-linux-${TARGETARCH:-amd64}" curl -O -J -L "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/latest/binaries/gitlab-ci-multi-runner-linux-${TARGETARCH:-amd64}"