From 52823f5550ec489f3101e0fc69dd3289c306b0c5 Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Tue, 6 Feb 2024 23:57:40 +0100
Subject: [PATCH] revert: use node-16

---
 .github/workflows/build.yml | 14 +++++++-------
 focal-arm64/Dockerfile      |  2 +-
 focal-armhf/Dockerfile      |  2 +-
 focal-ppc64le/Dockerfile    |  2 +-
 focal-x64/Dockerfile        | 20 ++++++++------------
 5 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 980de3c..b25c194 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,14 +10,14 @@ jobs:
       fail-fast: false
       matrix:
         arch:
-          # - alpine-x64
-          # - alpine-arm64
+          - alpine-x64
+          - alpine-arm64
           - focal-x64
-          # - focal-arm64
-          # - focal-armhf
-          # - focal-ppc64le
-          # - centos7-devtoolset8-arm64
-          # - centos7-devtoolset8-x64
+          - focal-arm64
+          - focal-armhf
+          - focal-ppc64le
+          - centos7-devtoolset8-arm64
+          - centos7-devtoolset8-x64
 
     steps:
       - uses: actions/checkout@v3
diff --git a/focal-arm64/Dockerfile b/focal-arm64/Dockerfile
index 9e862ab..b34e879 100644
--- a/focal-arm64/Dockerfile
+++ b/focal-arm64/Dockerfile
@@ -54,7 +54,7 @@ RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/so
 RUN apt-get update && apt-get install -y yarn
 
 # Node.js
-RUN curl --silent --location https://deb.nodesource.com/setup_18.x | sudo -E bash -
+RUN curl --silent --location https://deb.nodesource.com/setup_16.x | sudo -E bash -
 RUN apt-get update && apt-get install -y nodejs
 RUN npm install -g npm@latest
 RUN npm install -g node-gyp
diff --git a/focal-armhf/Dockerfile b/focal-armhf/Dockerfile
index 2c8355b..4bf1ede 100644
--- a/focal-armhf/Dockerfile
+++ b/focal-armhf/Dockerfile
@@ -54,7 +54,7 @@ RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/so
 RUN apt-get update && apt-get install -y yarn
 
 # Node.js
-RUN curl --silent --location https://deb.nodesource.com/setup_18.x | sudo -E bash -
+RUN curl --silent --location https://deb.nodesource.com/setup_16.x | sudo -E bash -
 RUN apt-get update && apt-get install -y nodejs
 RUN npm install -g npm@latest
 RUN npm install -g node-gyp
diff --git a/focal-ppc64le/Dockerfile b/focal-ppc64le/Dockerfile
index 8e6c8ab..421655b 100644
--- a/focal-ppc64le/Dockerfile
+++ b/focal-ppc64le/Dockerfile
@@ -45,7 +45,7 @@ RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/so
 RUN apt-get update && apt-get install -y yarn
 
 # Node.js
-RUN curl --silent --location https://deb.nodesource.com/setup_18.x | sudo -E bash -
+RUN curl --silent --location https://deb.nodesource.com/setup_16.x | sudo -E bash -
 RUN apt-get update && apt-get install -y nodejs
 RUN npm install -g npm@latest
 RUN npm install -g node-gyp
diff --git a/focal-x64/Dockerfile b/focal-x64/Dockerfile
index b11d70f..a9cd248 100644
--- a/focal-x64/Dockerfile
+++ b/focal-x64/Dockerfile
@@ -67,20 +67,16 @@ RUN apt-get update && apt-get install -y \
 # RUN echo 'builduser ALL=NOPASSWD: ALL' >> /etc/sudoers.d/50-builduser \
 #   && echo 'Defaults    env_keep += "DEBIAN_FRONTEND"' >> /etc/sudoers.d/env_keep
 
-# NVM
-ENV NVM_VERSION v0.39.7
-ENV NVM_DIR /$HOME/.nvm
-ENV NODE_PATH $NVM_DIR/v$NODE_VERSION/lib/node_modules
-ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH
-RUN mkdir $NVM_DIR
-RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
+# Yarn
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
+RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
+RUN apt-get update && apt-get install -y yarn
 
 # Node.js
-RUN wget https://unofficial-builds.nodejs.org/download/release/v18.19.0/node-v18.19.0-linux-x64-glibc-217.tar.xz
-RUN tar -xf node-v18.19.0-linux-x64-glibc-217.tar.xz
-RUN mkdir -p ~/.nvm/versions/node && mv node-v18.19.0-linux-x64-glibc-217 ~/.nvm/versions/node/v18.99.0
-RUN bash -c 'source $NVM_DIR/nvm.sh && nvm use 18.99.0'
-RUN npm install -g npm@latest node-gyp yarn
+RUN curl --silent --location https://deb.nodesource.com/setup_16.x | sudo -E bash -
+RUN apt-get update && apt-get install -y nodejs
+RUN npm install -g npm@latest
+RUN npm install -g node-gyp
 
 # Set python3 as default
 RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 1