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

Merge branch '79-yarn-1-from-npm' into 'master'

Browse source 
Use npm repo instead of apt on Yarn install

Closes #79

See merge request gitlab-org/gitlab-build-images!397
This commit is contained in:
Mike Greiling 2021-04-27 16:38:36 +00:00
commit 0dc406c14b
4 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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.16.1 ENV NODE_VERSION=14.16.1
ENV YARN_VERSION=1.22.5-1 ENV YARN_VERSION=1.22.10
ENV GITLAB_GEM_VERSION=4.16.1 ENV GITLAB_GEM_VERSION=4.16.1
ENV DANGER_GEM_VERSION=8.2.2 ENV DANGER_GEM_VERSION=8.2.2
ENV DANGER_GITLAB_GEM_VERSION=8.0.0 ENV DANGER_GITLAB_GEM_VERSION=8.0.0

8
scripts/custom-docker-build
View file

@ -133,10 +133,10 @@ function print_node_args() {
function print_yarn_args() { function print_yarn_args() {
case "$1" in case "$1" in
1.12) YARN_INSTALL_VERSION=1.12.3-1 ;; 1.12) YARN_INSTALL_VERSION=1.12.3 ;;
1.16) YARN_INSTALL_VERSION=1.16.0-1 ;; 1.16) YARN_INSTALL_VERSION=1.16.0 ;;
1.21) YARN_INSTALL_VERSION=1.21.1-1 ;; 1.21) YARN_INSTALL_VERSION=1.21.1 ;;
1.22) YARN_INSTALL_VERSION=1.22.5-1 ;; 1.22) YARN_INSTALL_VERSION=1.22.10 ;;
*) 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"

9
scripts/install-node
View file

@ -3,15 +3,13 @@ set -xeuo pipefail
IFS=$'\n\t' IFS=$'\n\t'
NODE_INSTALL_VERSION=${1:-14.16.0} NODE_INSTALL_VERSION=${1:-14.16.0}
YARN_INSTALL_VERSION=${2:-1.21.1-1} YARN_INSTALL_VERSION=${2:-1.22.10}
# 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"`
# add official debian repos for node and yarn # 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 -
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
apt-get update apt-get update
@ -20,7 +18,8 @@ curl -s -O "https://deb.nodesource.com/node_$NODE_MAJOR/pool/main/n/nodejs/$NODE
dpkg -i "$NODE_FILE_NAME" dpkg -i "$NODE_FILE_NAME"
rm -f "$NODE_FILE_NAME" rm -f "$NODE_FILE_NAME"
apt-get install -y yarn=$YARN_INSTALL_VERSION npm install --global yarn@${YARN_INSTALL_VERSION}
npm cache clean --force
apt-get autoremove -yq apt-get autoremove -yq
apt-get clean -yqq apt-get clean -yqq

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

@ -27,7 +27,7 @@ apt-get install -yq --no-install-recommends imagemagick
# Install node & yarn # Install node & yarn
NODE_INSTALL_VERSION=12.4.0 NODE_INSTALL_VERSION=12.4.0
YARN_INSTALL_VERSION=1.21.1-1 YARN_INSTALL_VERSION=1.22.10
/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 yamllint # Install yamllint