From c4d4088d3e7f3e3f896ed0bb482560ab702d5465 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Tue, 21 Nov 2023 17:39:59 -0500 Subject: [PATCH] 18874: Add yarn, update nodejs version to match lib/install. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- build/package-build-dockerfiles/Makefile | 6 +++--- build/package-build-dockerfiles/centos7/Dockerfile | 12 ++++++++---- build/package-build-dockerfiles/debian10/Dockerfile | 12 ++++++++---- build/package-build-dockerfiles/debian11/Dockerfile | 12 ++++++++---- build/package-build-dockerfiles/rocky8/Dockerfile | 12 ++++++++---- .../package-build-dockerfiles/ubuntu1804/Dockerfile | 12 ++++++++---- .../package-build-dockerfiles/ubuntu2004/Dockerfile | 12 ++++++++---- build/run-tests.sh | 2 +- 8 files changed, 52 insertions(+), 28 deletions(-) diff --git a/build/package-build-dockerfiles/Makefile b/build/package-build-dockerfiles/Makefile index 416e746d20..b2f2b0cc1b 100644 --- a/build/package-build-dockerfiles/Makefile +++ b/build/package-build-dockerfiles/Makefile @@ -33,9 +33,9 @@ GOTARBALL_=DOES_NOT_EXIST NODETARBALL_=DOES_NOT_EXIST GOVERSION=$(shell grep 'const goversion =' ../../lib/install/deps.go |awk -F'"' '{print $$2}') GOTARBALL_x86_64=go$(GOVERSION).linux-amd64.tar.gz -NODETARBALL_x86_64=node-v10.23.1-linux-x64.tar.xz +NODETARBALL_x86_64=node-v12.22.12-linux-x64.tar.xz GOTARBALL_aarch64=go$(GOVERSION).linux-arm64.tar.gz -NODETARBALL_aarch64=node-v10.23.1-linux-arm64.tar.xz +NODETARBALL_aarch64=node-v12.22.12-linux-arm64.tar.xz # Get the bash variable $HOSTTYPE (this requires the SHELL line above) HOSTTYPE=$(shell echo $${HOSTTYPE}) @@ -52,7 +52,7 @@ common-generated/$(GOTARBALL): common-generated wget -cqO common-generated/$(GOTARBALL) https://dl.google.com/go/$(GOTARBALL) common-generated/$(NODETARBALL): common-generated - wget -cqO common-generated/$(NODETARBALL) https://nodejs.org/dist/v10.23.1/$(NODETARBALL) + wget -cqO common-generated/$(NODETARBALL) https://nodejs.org/dist/v12.22.12/$(NODETARBALL) common-generated/$(RVMKEY1): common-generated wget -cqO common-generated/$(RVMKEY1) https://rvm.io/mpapis.asc diff --git a/build/package-build-dockerfiles/centos7/Dockerfile b/build/package-build-dockerfiles/centos7/Dockerfile index 2a1903f0e6..f731f1a426 100644 --- a/build/package-build-dockerfiles/centos7/Dockerfile +++ b/build/package-build-dockerfiles/centos7/Dockerfile @@ -12,8 +12,10 @@ ONBUILD ARG GOVERSION ONBUILD ADD generated/go${GOVERSION}.linux-amd64.tar.gz /usr/local/ ONBUILD RUN ln -s /usr/local/go/bin/go /usr/local/bin/ # Install nodejs and npm -ONBUILD ADD generated/node-v10.23.1-linux-x64.tar.xz /usr/local/ -ONBUILD RUN ln -s /usr/local/node-v10.23.1-linux-x64/bin/* /usr/local/bin/ +ONBUILD ADD generated/node-v12.22.12-linux-x64.tar.xz /usr/local/ +ONBUILD RUN ln -s /usr/local/node-v12.22.12-linux-x64/bin/* /usr/local/bin/ +ONBUILD RUN npm install -g yarn +ONBUILD RUN ln -sf /usr/local/node-v12.22.12-linux-x64/bin/* /usr/local/bin/ FROM centos:7 as build_aarch64 # Install go @@ -21,8 +23,10 @@ ONBUILD ARG GOVERSION ONBUILD ADD generated/go${GOVERSION}.linux-arm64.tar.gz /usr/local/ ONBUILD RUN ln -s /usr/local/go/bin/go /usr/local/bin/ # Install nodejs and npm -ONBUILD ADD generated/node-v10.23.1-linux-arm64.tar.xz /usr/local/ -ONBUILD RUN ln -s /usr/local/node-v10.23.1-linux-arm64/bin/* /usr/local/bin/ +ONBUILD ADD generated/node-v12.22.12-linux-arm64.tar.xz /usr/local/ +ONBUILD RUN ln -s /usr/local/node-v12.22.12-linux-arm64/bin/* /usr/local/bin/ +ONBUILD RUN npm install -g yarn +ONBUILD RUN ln -sf /usr/local/node-v12.22.12-linux-arm64/bin/* /usr/local/bin/ FROM build_${HOSTTYPE} diff --git a/build/package-build-dockerfiles/debian10/Dockerfile b/build/package-build-dockerfiles/debian10/Dockerfile index 2da5882717..c10d2dfeab 100644 --- a/build/package-build-dockerfiles/debian10/Dockerfile +++ b/build/package-build-dockerfiles/debian10/Dockerfile @@ -13,8 +13,10 @@ ONBUILD ARG GOVERSION ONBUILD ADD generated/go${GOVERSION}.linux-amd64.tar.gz /usr/local/ ONBUILD RUN ln -s /usr/local/go/bin/go /usr/local/bin/ # Install nodejs and npm -ONBUILD ADD generated/node-v10.23.1-linux-x64.tar.xz /usr/local/ -ONBUILD RUN ln -s /usr/local/node-v10.23.1-linux-x64/bin/* /usr/local/bin/ +ONBUILD ADD generated/node-v12.22.12-linux-x64.tar.xz /usr/local/ +ONBUILD RUN ln -s /usr/local/node-v12.22.12-linux-x64/bin/* /usr/local/bin/ +ONBUILD RUN npm install -g yarn +ONBUILD RUN ln -sf /usr/local/node-v12.22.12-linux-x64/bin/* /usr/local/bin/ # No cross compilation support for debian10 because of https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=983477 FROM debian:buster as build_aarch64 @@ -23,8 +25,10 @@ ONBUILD ARG GOVERSION ONBUILD ADD generated/go${GOVERSION}.linux-arm64.tar.gz /usr/local/ ONBUILD RUN ln -s /usr/local/go/bin/go /usr/local/bin/ # Install nodejs and npm -ONBUILD ADD generated/node-v10.23.1-linux-arm64.tar.xz /usr/local/ -ONBUILD RUN ln -s /usr/local/node-v10.23.1-linux-arm64/bin/* /usr/local/bin/ +ONBUILD ADD generated/node-v12.22.12-linux-arm64.tar.xz /usr/local/ +ONBUILD RUN ln -s /usr/local/node-v12.22.12-linux-arm64/bin/* /usr/local/bin/ +ONBUILD RUN npm install -g yarn +ONBUILD RUN ln -sf /usr/local/node-v12.22.12-linux-arm64/bin/* /usr/local/bin/ FROM build_${HOSTTYPE} diff --git a/build/package-build-dockerfiles/debian11/Dockerfile b/build/package-build-dockerfiles/debian11/Dockerfile index a421a9807a..c420ada61c 100644 --- a/build/package-build-dockerfiles/debian11/Dockerfile +++ b/build/package-build-dockerfiles/debian11/Dockerfile @@ -13,8 +13,10 @@ ONBUILD ARG GOVERSION ONBUILD ADD generated/go${GOVERSION}.linux-amd64.tar.gz /usr/local/ ONBUILD RUN ln -s /usr/local/go/bin/go /usr/local/bin/ # Install nodejs and npm -ONBUILD ADD generated/node-v10.23.1-linux-x64.tar.xz /usr/local/ -ONBUILD RUN ln -s /usr/local/node-v10.23.1-linux-x64/bin/* /usr/local/bin/ +ONBUILD ADD generated/node-v12.22.12-linux-x64.tar.xz /usr/local/ +ONBUILD RUN ln -s /usr/local/node-v12.22.12-linux-x64/bin/* /usr/local/bin/ +ONBUILD RUN npm install -g yarn +ONBUILD RUN ln -sf /usr/local/node-v12.22.12-linux-x64/bin/* /usr/local/bin/ # On x86, we want some cross-compilation support for arm64 # Add gcc-aarch64-linux-gnu to compile go binaries for arm64 ONBUILD RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y gcc-aarch64-linux-gnu @@ -28,8 +30,10 @@ ONBUILD ARG GOVERSION ONBUILD ADD generated/go${GOVERSION}.linux-arm64.tar.gz /usr/local/ ONBUILD RUN ln -s /usr/local/go/bin/go /usr/local/bin/ # Install nodejs and npm -ONBUILD ADD generated/node-v10.23.1-linux-arm64.tar.xz /usr/local/ -ONBUILD RUN ln -s /usr/local/node-v10.23.1-linux-arm64/bin/* /usr/local/bin/ +ONBUILD ADD generated/node-v12.22.12-linux-arm64.tar.xz /usr/local/ +ONBUILD RUN ln -s /usr/local/node-v12.22.12-linux-arm64/bin/* /usr/local/bin/ +ONBUILD RUN npm install -g yarn +ONBUILD RUN ln -sf /usr/local/node-v12.22.12-linux-arm64/bin/* /usr/local/bin/ FROM build_${HOSTTYPE} RUN echo HOSTTYPE ${HOSTTYPE} diff --git a/build/package-build-dockerfiles/rocky8/Dockerfile b/build/package-build-dockerfiles/rocky8/Dockerfile index 5dc762d50e..ee999a8274 100644 --- a/build/package-build-dockerfiles/rocky8/Dockerfile +++ b/build/package-build-dockerfiles/rocky8/Dockerfile @@ -12,8 +12,10 @@ ONBUILD ARG GOVERSION ONBUILD ADD generated/go${GOVERSION}.linux-amd64.tar.gz /usr/local/ ONBUILD RUN ln -s /usr/local/go/bin/go /usr/local/bin/ # Install nodejs and npm -ONBUILD ADD generated/node-v10.23.1-linux-x64.tar.xz /usr/local/ -ONBUILD RUN ln -s /usr/local/node-v10.23.1-linux-x64/bin/* /usr/local/bin/ +ONBUILD ADD generated/node-v12.22.12-linux-x64.tar.xz /usr/local/ +ONBUILD RUN ln -s /usr/local/node-v12.22.12-linux-x64/bin/* /usr/local/bin/ +ONBUILD RUN npm install -g yarn +ONBUILD RUN ln -sf /usr/local/node-v12.22.12-linux-x64/bin/* /usr/local/bin/ FROM rockylinux:8.6-minimal as build_aarch64 # Install go @@ -21,8 +23,10 @@ ONBUILD ARG GOVERSION ONBUILD ADD generated/go${GOVERSION}.linux-arm64.tar.gz /usr/local/ ONBUILD RUN ln -s /usr/local/go/bin/go /usr/local/bin/ # Install nodejs and npm -ONBUILD ADD generated/node-v10.23.1-linux-arm64.tar.xz /usr/local/ -ONBUILD RUN ln -s /usr/local/node-v10.23.1-linux-arm64/bin/* /usr/local/bin/ +ONBUILD ADD generated/node-v12.22.12-linux-arm64.tar.xz /usr/local/ +ONBUILD RUN ln -s /usr/local/node-v12.22.12-linux-arm64/bin/* /usr/local/bin/ +ONBUILD RUN npm install -g yarn +ONBUILD RUN ln -sf /usr/local/node-v12.22.12-linux-arm64/bin/* /usr/local/bin/ FROM build_${HOSTTYPE} diff --git a/build/package-build-dockerfiles/ubuntu1804/Dockerfile b/build/package-build-dockerfiles/ubuntu1804/Dockerfile index ae2e7ad4e1..27102f5876 100644 --- a/build/package-build-dockerfiles/ubuntu1804/Dockerfile +++ b/build/package-build-dockerfiles/ubuntu1804/Dockerfile @@ -12,8 +12,10 @@ ONBUILD ARG GOVERSION ONBUILD ADD generated/go${GOVERSION}.linux-amd64.tar.gz /usr/local/ ONBUILD RUN ln -s /usr/local/go/bin/go /usr/local/bin/ # Install nodejs and npm -ONBUILD ADD generated/node-v10.23.1-linux-x64.tar.xz /usr/local/ -ONBUILD RUN ln -s /usr/local/node-v10.23.1-linux-x64/bin/* /usr/local/bin/ +ONBUILD ADD generated/node-v12.22.12-linux-x64.tar.xz /usr/local/ +ONBUILD RUN ln -s /usr/local/node-v12.22.12-linux-x64/bin/* /usr/local/bin/ +ONBUILD RUN npm install -g yarn +ONBUILD RUN ln -sf /usr/local/node-v12.22.12-linux-x64/bin/* /usr/local/bin/ # No cross compilation support for ubuntu1804 because of https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=983477 FROM ubuntu:bionic as build_aarch64 @@ -22,8 +24,10 @@ ONBUILD ARG GOVERSION ONBUILD ADD generated/go${GOVERSION}.linux-arm64.tar.gz /usr/local/ ONBUILD RUN ln -s /usr/local/go/bin/go /usr/local/bin/ # Install nodejs and npm -ONBUILD ADD generated/node-v10.23.1-linux-arm64.tar.xz /usr/local/ -ONBUILD RUN ln -s /usr/local/node-v10.23.1-linux-arm64/bin/* /usr/local/bin/ +ONBUILD ADD generated/node-v12.22.12-linux-arm64.tar.xz /usr/local/ +ONBUILD RUN ln -s /usr/local/node-v12.22.12-linux-arm64/bin/* /usr/local/bin/ +ONBUILD RUN npm install -g yarn +ONBUILD RUN ln -sf /usr/local/node-v12.22.12-linux-arm64/bin/* /usr/local/bin/ FROM build_${HOSTTYPE} diff --git a/build/package-build-dockerfiles/ubuntu2004/Dockerfile b/build/package-build-dockerfiles/ubuntu2004/Dockerfile index bfe67cc34c..ad1222c0fb 100644 --- a/build/package-build-dockerfiles/ubuntu2004/Dockerfile +++ b/build/package-build-dockerfiles/ubuntu2004/Dockerfile @@ -12,8 +12,10 @@ ONBUILD ARG GOVERSION ONBUILD ADD generated/go${GOVERSION}.linux-amd64.tar.gz /usr/local/ ONBUILD RUN ln -s /usr/local/go/bin/go /usr/local/bin/ # Install nodejs and npm -ONBUILD ADD generated/node-v10.23.1-linux-x64.tar.xz /usr/local/ -ONBUILD RUN ln -s /usr/local/node-v10.23.1-linux-x64/bin/* /usr/local/bin/ +ONBUILD ADD generated/node-v12.22.12-linux-x64.tar.xz /usr/local/ +ONBUILD RUN ln -s /usr/local/node-v12.22.12-linux-x64/bin/* /usr/local/bin/ +ONBUILD RUN npm install -g yarn +ONBUILD RUN ln -sf /usr/local/node-v12.22.12-linux-x64/bin/* /usr/local/bin/ # On x86, we want some cross-compilation support for arm64 # Add gcc-aarch64-linux-gnu to compile go binaries for arm64 ONBUILD RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y gcc-aarch64-linux-gnu @@ -33,8 +35,10 @@ ONBUILD ARG GOVERSION ONBUILD ADD generated/go${GOVERSION}.linux-arm64.tar.gz /usr/local/ ONBUILD RUN ln -s /usr/local/go/bin/go /usr/local/bin/ # Install nodejs and npm -ONBUILD ADD generated/node-v10.23.1-linux-arm64.tar.xz /usr/local/ -ONBUILD RUN ln -s /usr/local/node-v10.23.1-linux-arm64/bin/* /usr/local/bin/ +ONBUILD ADD generated/node-v12.22.12-linux-arm64.tar.xz /usr/local/ +ONBUILD RUN ln -s /usr/local/node-v12.22.12-linux-arm64/bin/* /usr/local/bin/ +ONBUILD RUN npm install -g yarn +ONBUILD RUN ln -sf /usr/local/node-v12.22.12-linux-arm64/bin/* /usr/local/bin/ FROM build_${HOSTTYPE} diff --git a/build/run-tests.sh b/build/run-tests.sh index 6ed2433699..83688e8727 100755 --- a/build/run-tests.sh +++ b/build/run-tests.sh @@ -223,7 +223,7 @@ sanity_checks() { || fatal "No gitolite. Try: apt-get install gitolite3" echo -n 'npm: ' npm --version \ - || fatal "No npm. Try: wget -O- https://nodejs.org/dist/v10.23.1/node-v10.23.1-linux-x64.tar.xz | sudo tar -C /usr/local -xJf - && sudo ln -s ../node-v10.23.1-linux-x64/bin/{node,npm} /usr/local/bin/" + || fatal "No npm. Try: wget -O- https://nodejs.org/dist/v12.22.12/node-v12.22.12-linux-x64.tar.xz | sudo tar -C /usr/local -xJf - && sudo ln -s ../node-v12.22.12-linux-x64/bin/{node,npm} /usr/local/bin/" echo -n 'cadaver: ' cadaver --version | grep -w cadaver \ || fatal "No cadaver. Try: apt-get install cadaver" -- 2.30.2