From b5cc37433d0d609776f7a5a1a366ded283a9df74 Mon Sep 17 00:00:00 2001
From: Evan Read <eread@gitlab.com>
Date: Mon, 6 Mar 2023 05:54:13 +0000
Subject: [PATCH] Add Ruby 3.2 version of www-gitlab-com Docker image

---
 .gitlab/ci/custom.images.yml                  |  3 +++
 ...itlab-com-debian-bullseye-ruby-3.0-node-16 |  2 +-
 ...itlab-com-debian-bullseye-ruby-3.2-node-18 | 23 +++++++++++++++++++
 scripts/install-www-gitlab-com                |  3 +--
 4 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 Dockerfile.www-gitlab-com-debian-bullseye-ruby-3.2-node-18

diff --git a/.gitlab/ci/custom.images.yml b/.gitlab/ci/custom.images.yml
index 74e9175..1026cf8 100644
--- a/.gitlab/ci/custom.images.yml
+++ b/.gitlab/ci/custom.images.yml
@@ -28,6 +28,9 @@ ubi-release:
 www-gitlab-com-debian-bullseye-ruby-3.0-node-16:
   extends: .build_static_image
 
+www-gitlab-com-debian-bullseye-ruby-3.2-node-18:
+  extends: .build_static_image
+
 build-git:
   extends: .build_static_image
 
diff --git a/Dockerfile.www-gitlab-com-debian-bullseye-ruby-3.0-node-16 b/Dockerfile.www-gitlab-com-debian-bullseye-ruby-3.0-node-16
index 172b5df..ba4d531 100644
--- a/Dockerfile.www-gitlab-com-debian-bullseye-ruby-3.0-node-16
+++ b/Dockerfile.www-gitlab-com-debian-bullseye-ruby-3.0-node-16
@@ -14,7 +14,7 @@ RUN cd /usr/bin && find ../lib/google-cloud-sdk/bin -type f -executable -exec ln
 
 ADD /scripts/ /scripts/
 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/
 # Must be set after install-essentials is run
diff --git a/Dockerfile.www-gitlab-com-debian-bullseye-ruby-3.2-node-18 b/Dockerfile.www-gitlab-com-debian-bullseye-ruby-3.2-node-18
new file mode 100644
index 0000000..18418ee
--- /dev/null
+++ b/Dockerfile.www-gitlab-com-debian-bullseye-ruby-3.2-node-18
@@ -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
diff --git a/scripts/install-www-gitlab-com b/scripts/install-www-gitlab-com
index 29dda8a..1ff7cba 100755
--- a/scripts/install-www-gitlab-com
+++ b/scripts/install-www-gitlab-com
@@ -20,9 +20,8 @@ function build_debian() {
     apt-get install -yq --no-install-recommends imagemagick
 
     # Install node & yarn
-    NODE_INSTALL_VERSION=16.14.2
     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
     curl -O -J -L "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/latest/binaries/gitlab-ci-multi-runner-linux-${TARGETARCH:-amd64}"