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

Merge branch 'eread/make-image-based-on-ruby-3_2_2-and-node_js-18_16_0' into 'master'

Browse source 
Make image based on Ruby 3.2.2 and Node.js 18.16.0

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

Merged-by: Stan Hu <stanhu@gmail.com>
Approved-by: Stan Hu <stanhu@gmail.com>
Co-authored-by: Evan Read <eread@gitlab.com>
This commit is contained in:
Stan Hu 2023-04-20 04:45:56 +00:00
commit 7fb5639f18
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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

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

@ -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}"