Merge remote-tracking branch 'upstream/main'

Author: jeanp413

aarch64-gcc-8.5.0-glibc-2.28.config

@@ -8,8 +8,8 @@ RUN groupadd --gid 121 builduser \
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
   software-properties-common \
-  gcc \
-  g++ \
+  gcc-8 \
+  g++-8 \
   binutils \
   build-essential \
   git \
@@ -36,3 +36,7 @@ RUN echo 'builduser ALL=NOPASSWD: ALL' >> /etc/sudoers.d/50-builduser \
 # https://docs.github.com/en/actions/creating-actions/dockerfile-support-for-github-actions#user
 # USER builduser
 # WORKDIR /home/builduser
+
+ENV CC=/usr/bin/gcc-8 \
+  CPP=/usr/bin/cpp-8 \
+  CXX=/usr/bin/g++-8

bionic-arm32v7/Dockerfile renamed to archived/bionic-arm32v7/Dockerfile_Unused

@@ -51,22 +51,18 @@ RUN echo 'builduser ALL=NOPASSWD: ALL' >> /etc/sudoers.d/50-builduser \
 RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 1
 RUN python --version
 
-# 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 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
-
 # Install docker client
 RUN sudo mkdir -m 0755 -p /etc/apt/keyrings
 RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
 RUN echo "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
-RUN sudo apt-get update && sudo apt-get install -y docker-ce
+RUN apt-get update && apt-get install -y docker-ce
+
+# Node.js
+RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+RUN echo "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list
+RUN apt-get update && apt-get install -y nodejs
+RUN npm install -g yarn
+RUN npm install -g node-gyp
 
 # Github action need root user
 # https://docs.github.com/en/actions/creating-actions/dockerfile-support-for-github-actions#user

bionic-arm64/Dockerfile renamed to archived/bionic-arm64/Dockerfile_Unused

@@ -51,22 +51,18 @@ RUN echo 'builduser ALL=NOPASSWD: ALL' >> /etc/sudoers.d/50-builduser \
 RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 1
 RUN python --version
 
-# 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 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
-
 # Install docker client
 RUN sudo mkdir -m 0755 -p /etc/apt/keyrings
 RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
 RUN echo "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
-RUN sudo apt-get update && sudo apt-get install -y docker-ce
+RUN apt-get update && apt-get install -y docker-ce
+
+# Node.js
+RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+RUN echo "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list
+RUN apt-get update && apt-get install -y nodejs
+RUN npm install -g yarn
+RUN npm install -g node-gyp
 
 # Github action need root user
 # https://docs.github.com/en/actions/creating-actions/dockerfile-support-for-github-actions#user

bionic-armhf/Dockerfile renamed to archived/bionic-armhf/Dockerfile_Unused

@@ -60,17 +60,6 @@ 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
 
-# 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 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
 RUN python --version
@@ -79,7 +68,14 @@ RUN python --version
 RUN sudo mkdir -m 0755 -p /etc/apt/keyrings
 RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
 RUN echo "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
-RUN sudo apt-get update && sudo apt-get install -y docker-ce
+RUN apt-get update && apt-get install -y docker-ce
+
+# Node.js
+RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list
+RUN apt-get update && apt-get install -y nodejs
+RUN npm install -g yarn
+RUN npm install -g node-gyp
 
 # Check compiler toolchain
 RUN gcc --version

archived/bionic-x64/Dockerfile_Unused renamed to archived/bionic-x64-v0/Dockerfile_Unused

@@ -10,19 +10,16 @@ ARG INSTALL_PKGS="devtoolset-8-gcc \
     sudo \
     libsecret-devel \
     krb5-devel \
-    nodejs \
     python3"
 
-# setup nodejs repo
-RUN curl --silent --location https://rpm.nodesource.com/setup_16.x | bash -
-
 RUN yum install -y centos-release-scl-rh && \
     yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
     yum -y clean all --enablerepo='*'
 
-# update npm and install yarn, node-gyp
-RUN npm install -g "[email protected]"
+# install nodejs
+RUN yum install https://rpm.nodesource.com/pub_16.x/nodistro/repo/nodesource-release-nodistro-1.noarch.rpm -y
+RUN yum install nodejs -y --setopt=nodesource-nodejs.module_hotfixes=1
 RUN npm install -g yarn
 RUN npm install -g node-gyp
 

archived/bionic-x64/xvfb-init.sh renamed to archived/bionic-x64-v0/xvfb-init.sh

@@ -12,19 +12,16 @@ ARG INSTALL_PKGS="devtoolset-8-gcc \
     sudo \
     libsecret-devel \
     krb5-devel \
-    nodejs \
     python3"
 
-# setup nodejs repo
-RUN curl --silent --location https://rpm.nodesource.com/setup_16.x | bash -
-
 RUN yum install -y centos-release-scl-rh && \
     yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
     yum -y clean all --enablerepo='*'
 
-# update npm and install yarn, node-gyp
-RUN npm install -g "[email protected]"
+# install nodejs
+RUN yum install https://rpm.nodesource.com/pub_16.x/nodistro/repo/nodesource-release-nodistro-1.noarch.rpm -y
+RUN yum install nodejs -y --setopt=nodesource-nodejs.module_hotfixes=1
 RUN npm install -g yarn
 RUN npm install -g node-gyp