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 index 2eed930..93ad032 100644 --- a/Dockerfile.www-gitlab-com-debian-bullseye-ruby-3.2-node-18 +++ b/Dockerfile.www-gitlab-com-debian-bullseye-ruby-3.2-node-18 @@ -5,7 +5,7 @@ ARG GCLOUD_VERSION=413.0.0 # 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 +FROM ruby:3.2.2-slim-bullseye # Install Google Cloud SDK for deploys via rsync COPY --from=gcloud-sdk /usr/lib/google-cloud-sdk /usr/lib/google-cloud-sdk @@ -15,7 +15,7 @@ RUN cd /usr/bin && find ../lib/google-cloud-sdk/bin -type f -executable -exec ln ADD /scripts/ /scripts/ ADD /patches /patches/ -ENV NODE_INSTALL_VERSION=18.14.2 +ENV NODE_INSTALL_VERSION=18.16.0 ENV YARN_INSTALL_VERSION=1.22.19 RUN /scripts/install-www-gitlab-com diff --git a/scripts/install-www-gitlab-com b/scripts/install-www-gitlab-com index 4a322cf..302c271 100755 --- a/scripts/install-www-gitlab-com +++ b/scripts/install-www-gitlab-com @@ -20,7 +20,7 @@ function build_debian() { apt-get install -yq --no-install-recommends imagemagick # Install node & yarn - /scripts/install-node "${NODE_INSTALL_VERSION} ${YARN_INSTALL_VERSION}" + /scripts/install-node "${NODE_INSTALL_VERSION}" "${YARN_INSTALL_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}"