From e8a541d1eef84140ea9397cb8c89bd2cb88d1c81 Mon Sep 17 00:00:00 2001 From: It's Davitt Date: Wed, 23 Oct 2024 18:55:54 +0700 Subject: [PATCH 1/5] Adding Nodejs (v22, v23) --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f0a211c..02a0dbe 100644 --- a/README.md +++ b/README.md @@ -234,7 +234,11 @@ is tagged correctly. * `ghcr.io/parkervcp/yolks:nodejs_20` * [`node21`](/nodejs/21) * `ghcr.io/parkervcp/yolks:nodejs_21` - +* [`node21`](/nodejs/22) + * `ghcr.io/parkervcp/yolks:nodejs_22` +* [`node23`](/nodejs/23) + * `ghcr.io/parkervcp/yolks:nodejs_23` + ### [PostgreSQL](/postgres) * [`Postgres 9`](/postgres/9) From 68f92a85abb2d3b9d2dd5279e07c2f0c20d6864f Mon Sep 17 00:00:00 2001 From: mydapitt Date: Wed, 23 Oct 2024 19:13:14 +0700 Subject: [PATCH 2/5] Added Nodejs (v22, v23), slight adjustments to some Nodejs Dockerfiles - Added Nodejs version 22 and 23 - Starting Nodejs 20, 22, and above will not use the Debian version code name to follow the release of the latest Debian operating system version in the future - In Dockerfile Nodejs 18, and 21 will install npm version 10.x.x --- .github/workflows/nodejs.yml | 2 ++ nodejs/18/Dockerfile | 2 +- nodejs/20/Dockerfile | 2 +- nodejs/22/Dockerfile | 25 +++++++++++++++++++++++++ nodejs/23/Dockerfile | 25 +++++++++++++++++++++++++ 5 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 nodejs/22/Dockerfile create mode 100644 nodejs/23/Dockerfile diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 39f3592..c327df6 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -24,6 +24,8 @@ jobs: - 19 - 20 - 21 + - 22 + - 23 steps: - uses: actions/checkout@v4 # Setup QEMU for ARM64 Build diff --git a/nodejs/18/Dockerfile b/nodejs/18/Dockerfile index 6117c85..ee3e920 100644 --- a/nodejs/18/Dockerfile +++ b/nodejs/18/Dockerfile @@ -6,7 +6,7 @@ RUN apt update \ && apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential libtool iputils-ping libnss3 tini \ && useradd -m -d /home/container container -RUN npm install npm@9.8.1 typescript ts-node @types/node --location=global +RUN npm install npm@10.x.x typescript ts-node @types/node --location=global # install pnpm RUN npm install -g corepack diff --git a/nodejs/20/Dockerfile b/nodejs/20/Dockerfile index 691e8b2..a921fac 100644 --- a/nodejs/20/Dockerfile +++ b/nodejs/20/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETOS/$TARGETARCH node:20-bookworm-slim +FROM --platform=$TARGETOS/$TARGETARCH node:20-slim LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/nodejs/22/Dockerfile b/nodejs/22/Dockerfile new file mode 100644 index 0000000..4877517 --- /dev/null +++ b/nodejs/22/Dockerfile @@ -0,0 +1,25 @@ +FROM --platform=$TARGETOS/$TARGETARCH node:22-slim + +LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" + +RUN apt update \ + && apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential libtool iputils-ping libnss3 tini \ + && useradd -m -d /home/container container + +RUN npm install npm@10.x.x typescript ts-node @types/node --location=global + +# install pnpm +RUN npm install -g corepack +RUN corepack enable +RUN corepack prepare pnpm@latest --activate + +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container + +STOPSIGNAL SIGINT + +COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh +ENTRYPOINT ["/usr/bin/tini", "-g", "--"] +CMD ["/entrypoint.sh"] diff --git a/nodejs/23/Dockerfile b/nodejs/23/Dockerfile new file mode 100644 index 0000000..874eab7 --- /dev/null +++ b/nodejs/23/Dockerfile @@ -0,0 +1,25 @@ +FROM --platform=$TARGETOS/$TARGETARCH node:23-slim + +LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" + +RUN apt update \ + && apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential libtool iputils-ping libnss3 tini \ + && useradd -m -d /home/container container + +RUN npm install npm@latest typescript ts-node @types/node --location=global + +# install pnpm +RUN npm install -g corepack +RUN corepack enable +RUN corepack prepare pnpm@latest --activate + +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container + +STOPSIGNAL SIGINT + +COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh +ENTRYPOINT ["/usr/bin/tini", "-g", "--"] +CMD ["/entrypoint.sh"] From 755085d2d9b45568c816ccc949be7b895356fb86 Mon Sep 17 00:00:00 2001 From: mydapitt Date: Wed, 23 Oct 2024 19:13:22 +0700 Subject: [PATCH 3/5] Added Nodejs (v22, v23), slight adjustments to some Nodejs Dockerfiles - Added Nodejs version 22 and 23 - Starting Nodejs 20, 22, and above will not use the Debian version code name to follow the release of the latest Debian operating system version in the future - In Dockerfile Nodejs 18, and 21 will install npm version 10.x.x --- nodejs/21/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nodejs/21/Dockerfile b/nodejs/21/Dockerfile index 8f6953c..fd28e79 100644 --- a/nodejs/21/Dockerfile +++ b/nodejs/21/Dockerfile @@ -6,7 +6,7 @@ RUN apt update \ && apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential libtool iputils-ping libnss3 tini \ && useradd -m -d /home/container container -RUN npm install npm@latest typescript ts-node @types/node --location=global +RUN npm install npm@10.x.x typescript ts-node @types/node --location=global # install pnpm RUN npm install -g corepack From bb8092b59257621cc53dba549db03bd97cff4df2 Mon Sep 17 00:00:00 2001 From: mydapitt Date: Wed, 23 Oct 2024 19:40:51 +0700 Subject: [PATCH 4/5] Add 'bookworm' label to Nodejs v20, v22, and v23 base image --- nodejs/20/Dockerfile | 2 +- nodejs/22/Dockerfile | 4 ++-- nodejs/23/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nodejs/20/Dockerfile b/nodejs/20/Dockerfile index a921fac..691e8b2 100644 --- a/nodejs/20/Dockerfile +++ b/nodejs/20/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETOS/$TARGETARCH node:20-slim +FROM --platform=$TARGETOS/$TARGETARCH node:20-bookworm-slim LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/nodejs/22/Dockerfile b/nodejs/22/Dockerfile index 4877517..e5b53b3 100644 --- a/nodejs/22/Dockerfile +++ b/nodejs/22/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETOS/$TARGETARCH node:22-slim +FROM --platform=$TARGETOS/$TARGETARCH node:22-bookworm-slim LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" @@ -6,7 +6,7 @@ RUN apt update \ && apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential libtool iputils-ping libnss3 tini \ && useradd -m -d /home/container container -RUN npm install npm@10.x.x typescript ts-node @types/node --location=global +RUN npm install npm@latest typescript ts-node @types/node --location=global # install pnpm RUN npm install -g corepack diff --git a/nodejs/23/Dockerfile b/nodejs/23/Dockerfile index 874eab7..5cb4278 100644 --- a/nodejs/23/Dockerfile +++ b/nodejs/23/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETOS/$TARGETARCH node:23-slim +FROM --platform=$TARGETOS/$TARGETARCH node:23-bookworm-slim LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" From 4384852949c209b902d38797a5abdce765bc89b3 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Fri, 1 Nov 2024 13:37:10 +0100 Subject: [PATCH 5/5] no need for nodejs 22 --- .github/workflows/nodejs.yml | 1 - README.md | 2 -- nodejs/22/Dockerfile | 25 ------------------------- 3 files changed, 28 deletions(-) delete mode 100644 nodejs/22/Dockerfile diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index c327df6..df3883c 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -24,7 +24,6 @@ jobs: - 19 - 20 - 21 - - 22 - 23 steps: - uses: actions/checkout@v4 diff --git a/README.md b/README.md index 02a0dbe..a10e18e 100644 --- a/README.md +++ b/README.md @@ -234,8 +234,6 @@ is tagged correctly. * `ghcr.io/parkervcp/yolks:nodejs_20` * [`node21`](/nodejs/21) * `ghcr.io/parkervcp/yolks:nodejs_21` -* [`node21`](/nodejs/22) - * `ghcr.io/parkervcp/yolks:nodejs_22` * [`node23`](/nodejs/23) * `ghcr.io/parkervcp/yolks:nodejs_23` diff --git a/nodejs/22/Dockerfile b/nodejs/22/Dockerfile deleted file mode 100644 index e5b53b3..0000000 --- a/nodejs/22/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -FROM --platform=$TARGETOS/$TARGETARCH node:22-bookworm-slim - -LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" - -RUN apt update \ - && apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential libtool iputils-ping libnss3 tini \ - && useradd -m -d /home/container container - -RUN npm install npm@latest typescript ts-node @types/node --location=global - -# install pnpm -RUN npm install -g corepack -RUN corepack enable -RUN corepack prepare pnpm@latest --activate - -USER container -ENV USER=container HOME=/home/container -WORKDIR /home/container - -STOPSIGNAL SIGINT - -COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh -RUN chmod +x /entrypoint.sh -ENTRYPOINT ["/usr/bin/tini", "-g", "--"] -CMD ["/entrypoint.sh"]