diff --git a/.gitlab/ci/custom.images.yml b/.gitlab/ci/custom.images.yml index 1026cf8..74e9175 100644 --- a/.gitlab/ci/custom.images.yml +++ b/.gitlab/ci/custom.images.yml @@ -28,9 +28,6 @@ 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 ba4d531..172b5df 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 NODE_INSTALL_VERSION=16.19.1 /scripts/install-www-gitlab-com +RUN /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 deleted file mode 100644 index 18418ee..0000000 --- a/Dockerfile.www-gitlab-com-debian-bullseye-ruby-3.2-node-18 +++ /dev/null @@ -1,23 +0,0 @@ -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 1ff7cba..29dda8a 100755 --- a/scripts/install-www-gitlab-com +++ b/scripts/install-www-gitlab-com @@ -20,8 +20,9 @@ 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}"