From 431cdf4738e7da95fdfd778f27ac2e7d26b96cdc Mon Sep 17 00:00:00 2001 From: Fijxu Date: Fri, 22 Mar 2024 19:29:32 -0300 Subject: [PATCH] Install nodejs in containers for statements --- linux-clang-format/Dockerfile | 5 +++-- linux-fresh/Dockerfile | 5 ++++- linux-mingw/Dockerfile | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/linux-clang-format/Dockerfile b/linux-clang-format/Dockerfile index 8263736..f7f30a4 100644 --- a/linux-clang-format/Dockerfile +++ b/linux-clang-format/Dockerfile @@ -1,11 +1,12 @@ FROM ubuntu:20.04 -LABEL maintainer="yuzu" +LABEL maintainer="suyu" # Create a user account yuzu (UID 1027) that the container will run as RUN useradd -m -u 1027 -s /bin/bash yuzu && \ apt-get update && apt-get -y full-upgrade && \ apt-get install -y git gpg-agent wget && \ wget https://apt.llvm.org/llvm-snapshot.gpg.key && apt-key add ./llvm-snapshot.gpg.key && \ + wget -qO- https://deb.nodesource.com/setup_20.x | bash - && \ echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main" >> /etc/apt/sources.list && \ - apt-get update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install -y clang-format-15 && \ + apt-get update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install -y clang-format-15 nodejs && \ apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/apt /var/lib/dpkg /var/lib/cache /var/lib/log USER 1027 diff --git a/linux-fresh/Dockerfile b/linux-fresh/Dockerfile index 4368aa2..9931b90 100644 --- a/linux-fresh/Dockerfile +++ b/linux-fresh/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:20.04 -LABEL maintainer="yuzu" +LABEL maintainer="suyu" ENV BOOST_VER=1_79_0 ENV CLANG_VER=14 @@ -90,6 +90,9 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && \ ln -s $(which clang-${CLANG_VER}) /usr/bin/clang && \ ln -s $(which clang++-${CLANG_VER}) /usr/bin/clang++ && \ dpkg-reconfigure ccache && \ +# Install NodeJS + wget -qO- https://deb.nodesource.com/setup_20.x | bash - && apt-get install -y nodejs && \ +# Clean Container apt-get clean autoclean && \ apt-get autoremove --yes && \ rm -rf /var/lib/apt /var/lib/dpkg /var/lib/cache /var/lib/log diff --git a/linux-mingw/Dockerfile b/linux-mingw/Dockerfile index de9835d..349b9c5 100644 --- a/linux-mingw/Dockerfile +++ b/linux-mingw/Dockerfile @@ -1,5 +1,5 @@ FROM archlinux:latest -LABEL maintainer="yuzu" +LABEL maintainer="suyu" # Add mingw-repo "ownstuff" is a AUR with an up to date mingw64 # Runs pacman -Syu twice in order to work around pacman issues where the first run only updates the @@ -43,6 +43,7 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && mkdir -p /tmp/pkgs && \ mingw-w64-winpthreads \ mingw-w64-zlib \ mingw-w64-zstd \ + nodejs-lts-iron \ && \ pacman -Scc --noconfirm && \ rm -rf /usr/share/man/ /tmp/* /var/tmp/ /usr/{i686-w64-mingw32,lib32} /usr/lib/gcc/i686-w64-mingw32