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

This commit is contained in:
Evan Read 2023-03-07 03:57:18 +00:00 committed by Balasankar 'Balu' C
parent 9639313abf
commit 0401bbf92f
5 changed files with 39 additions and 9 deletions

View file

@ -2,14 +2,11 @@
set -xeuo pipefail
IFS=$'\n\t'
NODE_INSTALL_VERSION=${1:-18.12.1}
YARN_INSTALL_VERSION=${2:-1.22.19}
# Map MAJOR.MINOR.patch -> MAJOR.x
NODE_MAJOR=`echo $NODE_INSTALL_VERSION | sed -r -e "s/([0-9]+)\.[0-9]+.*/\1\.x/g"`
NODE_MAJOR=$(echo "$NODE_INSTALL_VERSION" | sed -r -e "s/([0-9]+)\.[0-9]+.*/\1\.x/g")
# add official debian repos for node
curl -sS -L https://deb.nodesource.com/setup_${NODE_MAJOR} | bash -
curl -sS -L "https://deb.nodesource.com/setup_${NODE_MAJOR}" | bash -
apt-get update
@ -18,9 +15,12 @@ curl -s -O "https://deb.nodesource.com/node_$NODE_MAJOR/pool/main/n/nodejs/$NODE
dpkg -i "$NODE_FILE_NAME"
rm -f "$NODE_FILE_NAME"
npm install --global yarn@${YARN_INSTALL_VERSION}
npm install --global "yarn@${YARN_INSTALL_VERSION}"
npm cache clean --force
apt-get autoremove -yq
apt-get clean -yqq
rm -rf /var/lib/apt/lists/*
node --version
yarn --version

View file

@ -20,9 +20,7 @@ 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}"
# 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}"