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

Merge branch 'leipert-add-node-16-images' into 'master'

Browse source 
Add node@16 images / update images to node@16

See merge request gitlab-org/gitlab-build-images!459
This commit is contained in:
Rémy Coutable 2022-02-21 17:38:50 +00:00
commit 6bb7cc091f
6 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitlab/ci/gitlab.images.yml
View file

@ -3,7 +3,6 @@
variables: variables:
LFS: '2.9' LFS: '2.9'
CHROME: '97' CHROME: '97'
NODE: '14.15'
YARN: '1.22' YARN: '1.22'
GRAPHICSMAGICK: '1.3.36' GRAPHICSMAGICK: '1.3.36'
parallel: parallel:
@ -13,6 +12,7 @@
GIT: ['2.33'] GIT: ['2.33']
POSTGRESQL: ['11', '12', '13'] POSTGRESQL: ['11', '12', '13']
GOLANG: ['1.16', '1.17'] GOLANG: ['1.16', '1.17']
NODE: ['14.15', '16.14']
gitlab test: gitlab test:
extends: extends:
@ -28,7 +28,6 @@ gitlab push:
.gitlab-assets-matrix: .gitlab-assets-matrix:
variables: variables:
LFS: '2.9' LFS: '2.9'
NODE: '14.15'
YARN: '1.22' YARN: '1.22'
GRAPHICSMAGICK: '1.3.36' GRAPHICSMAGICK: '1.3.36'
parallel: parallel:
@ -36,6 +35,7 @@ gitlab push:
- DEBIAN: ['bullseye'] - DEBIAN: ['bullseye']
RUBY: ['2.7', '3.0'] RUBY: ['2.7', '3.0']
GIT: ['2.31', '2.33'] GIT: ['2.31', '2.33']
NODE: ['14.15', '16.14']
gitlab-assets test: gitlab-assets test:
extends: extends:

2
Dockerfile.danger
View file

@ -7,7 +7,7 @@ MAINTAINER GitLab Quality Team
ENV LC_ALL "C.UTF-8" ENV LC_ALL "C.UTF-8"
ENV NODE_VERSION=14.17.2 ENV NODE_VERSION=14.17.2
ENV YARN_VERSION=1.22.10 ENV YARN_VERSION=1.22.17
ENV GITLAB_GEM_VERSION=4.17.0 ENV GITLAB_GEM_VERSION=4.17.0
ENV DANGER_GEM_VERSION=8.3.1 ENV DANGER_GEM_VERSION=8.3.1
ENV DANGER_GITLAB_GEM_VERSION=8.0.0 ENV DANGER_GITLAB_GEM_VERSION=8.0.0

2
Dockerfile.danger-ruby-2.6.6
View file

@ -7,7 +7,7 @@ MAINTAINER GitLab Quality Team
ENV LC_ALL "C.UTF-8" ENV LC_ALL "C.UTF-8"
ENV NODE_VERSION=14.17.2 ENV NODE_VERSION=14.17.2
ENV YARN_VERSION=1.22.10 ENV YARN_VERSION=1.22.17
ENV GITLAB_GEM_VERSION=4.17.0 ENV GITLAB_GEM_VERSION=4.17.0
ENV DANGER_GEM_VERSION=8.3.1 ENV DANGER_GEM_VERSION=8.3.1
ENV DANGER_GITLAB_GEM_VERSION=8.0.0 ENV DANGER_GITLAB_GEM_VERSION=8.0.0

2
Dockerfile.gitlab-puppeteer
View file

@ -1,4 +1,4 @@
FROM node:14 FROM node:16
ADD /scripts/ /scripts/ ADD /scripts/ /scripts/

2
scripts/custom-docker-build
View file

@ -115,7 +115,7 @@ function print_yarn_args() {
1.12) YARN_INSTALL_VERSION=1.12.3 ;; 1.12) YARN_INSTALL_VERSION=1.12.3 ;;
1.16) YARN_INSTALL_VERSION=1.16.0 ;; 1.16) YARN_INSTALL_VERSION=1.16.0 ;;
1.21) YARN_INSTALL_VERSION=1.21.1 ;; 1.21) YARN_INSTALL_VERSION=1.21.1 ;;
1.22) YARN_INSTALL_VERSION=1.22.10 ;; 1.22) YARN_INSTALL_VERSION=1.22.17 ;;
*) echo "Unknown yarn version $1"; exit 1; *) echo "Unknown yarn version $1"; exit 1;
esac esac
printf -- "--build-arg YARN_INSTALL_VERSION=%s " "$YARN_INSTALL_VERSION" printf -- "--build-arg YARN_INSTALL_VERSION=%s " "$YARN_INSTALL_VERSION"

4
scripts/install-node
View file

@ -2,8 +2,8 @@
set -xeuo pipefail set -xeuo pipefail
IFS=$'\n\t' IFS=$'\n\t'
NODE_INSTALL_VERSION=${1:-14.16.0} NODE_INSTALL_VERSION=${1:-16.14.0}
YARN_INSTALL_VERSION=${2:-1.22.10} YARN_INSTALL_VERSION=${2:-1.22.17}
# Map MAJOR.MINOR.patch -> MAJOR.x # 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"`