From 167df328f4a8d5c9ccb1ca4d8404f9871d502561 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Tue, 7 Dec 2021 21:35:49 -0500 Subject: [PATCH 01/10] add libevent-dev to ubuntu/debian required to run webdis --- oses/debian/Dockerfile | 2 +- oses/ubuntu/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/oses/debian/Dockerfile b/oses/debian/Dockerfile index c9a27ea..25aef53 100644 --- a/oses/debian/Dockerfile +++ b/oses/debian/Dockerfile @@ -20,7 +20,7 @@ RUN apt update \ ## Install dependencies RUN apt install -y gcc g++ libgcc1 lib32gcc-s1 libc++-dev gdb libc6 git wget curl tar zip unzip binutils xz-utils liblzo2-2 cabextract iproute2 net-tools netcat telnet libatomic1 libsdl1.2debian libsdl2-2.0-0 \ libfontconfig libicu67 icu-devtools libunwind8 libssl-dev sqlite3 libsqlite3-dev libmariadbclient-dev-compat libduktape205 locales ffmpeg gnupg2 apt-transport-https software-properties-common ca-certificates \ - liblua5.4-0 libz-dev rapidjson-dev tzdata + liblua5.4-0 libz-dev rapidjson-dev tzdata libevent-dev ## Configure locale RUN update-locale lang=en_US.UTF-8 \ diff --git a/oses/ubuntu/Dockerfile b/oses/ubuntu/Dockerfile index 6b3f63d..d6f3a62 100644 --- a/oses/ubuntu/Dockerfile +++ b/oses/ubuntu/Dockerfile @@ -14,7 +14,7 @@ RUN apt update \ ## install dependencies RUN apt install -y gcc g++ libgcc1 lib32gcc1 libc++-dev gdb libc6 git wget curl tar zip unzip binutils xz-utils liblzo2-2 cabextract iproute2 net-tools netcat telnet libatomic1 libsdl1.2debian libsdl2-2.0-0 \ libfontconfig libicu60 libiculx60 icu-devtools libunwind8 libssl1.0.0 libssl1.0-dev sqlite3 libsqlite3-dev libmariadbclient-dev libduktape202 libzip4 locales ffmpeg apt-transport-https init-system-helpers \ - libcurl3-gnutls libjsoncpp1 libleveldb1v5 liblua5.1-0 libluajit-5.1-2 libsqlite3-0 libfluidsynth1 bzip2 zlib1g + libcurl3-gnutls libjsoncpp1 libleveldb1v5 liblua5.1-0 libluajit-5.1-2 libsqlite3-0 libfluidsynth1 bzip2 zlib1g libevent-dev ## configure locale RUN update-locale lang=en_US.UTF-8 \ From d5e1e2e5ec9ac540730492bf1c58875a20c104da Mon Sep 17 00:00:00 2001 From: gOOvER Date: Wed, 8 Dec 2021 07:30:18 +0100 Subject: [PATCH 02/10] update all nodejs to bullseye-slim --- nodejs/12/Dockerfile | 2 +- nodejs/14/Dockerfile | 2 +- nodejs/15/Dockerfile | 2 +- nodejs/16/Dockerfile | 2 +- nodejs/17/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nodejs/12/Dockerfile b/nodejs/12/Dockerfile index 45e80bd..2ae9d90 100644 --- a/nodejs/12/Dockerfile +++ b/nodejs/12/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETOS/$TARGETARCH node:12-buster-slim +FROM --platform=$TARGETOS/$TARGETARCH node:12-bullseye-slim LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/nodejs/14/Dockerfile b/nodejs/14/Dockerfile index 634402c..63eca05 100644 --- a/nodejs/14/Dockerfile +++ b/nodejs/14/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETOS/$TARGETARCH node:14-buster-slim +FROM --platform=$TARGETOS/$TARGETARCH node:14-bullseye-slim LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/nodejs/15/Dockerfile b/nodejs/15/Dockerfile index 6d9b491..9aed52b 100644 --- a/nodejs/15/Dockerfile +++ b/nodejs/15/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETOS/$TARGETARCH node:15-buster-slim +FROM --platform=$TARGETOS/$TARGETARCH node:15-bullseye-slim LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/nodejs/16/Dockerfile b/nodejs/16/Dockerfile index b09c15f..b0140b7 100644 --- a/nodejs/16/Dockerfile +++ b/nodejs/16/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETOS/$TARGETARCH node:16-buster-slim +FROM --platform=$TARGETOS/$TARGETARCH node:16-bullseye-slim LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/nodejs/17/Dockerfile b/nodejs/17/Dockerfile index f8c6257..b3e91d4 100644 --- a/nodejs/17/Dockerfile +++ b/nodejs/17/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETOS/$TARGETARCH node:17-buster-slim +FROM --platform=$TARGETOS/$TARGETARCH node:17-bullseye-slim LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" From 38ef2e77c53fc6c3ffc8702fdd097a7c64b8fd38 Mon Sep 17 00:00:00 2001 From: Ethan Adams Date: Wed, 8 Dec 2021 14:09:53 -0500 Subject: [PATCH 03/10] Added libtool installation to Node.js 17 Docker file --- nodejs/17/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nodejs/17/Dockerfile b/nodejs/17/Dockerfile index b3e91d4..9a35af5 100644 --- a/nodejs/17/Dockerfile +++ b/nodejs/17/Dockerfile @@ -3,7 +3,7 @@ FROM --platform=$TARGETOS/$TARGETARCH node:17-bullseye-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 \ + && apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential libtool \ && npm -g install npm@latest \ && useradd -m -d /home/container container From a6d1d9f28ef9b43b2c21ab635d686d8ff3399b0d Mon Sep 17 00:00:00 2001 From: Ethan Adams Date: Wed, 8 Dec 2021 14:10:50 -0500 Subject: [PATCH 04/10] Added libtool installation to Node.js 16 docker file --- nodejs/16/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nodejs/16/Dockerfile b/nodejs/16/Dockerfile index b0140b7..354df7b 100644 --- a/nodejs/16/Dockerfile +++ b/nodejs/16/Dockerfile @@ -3,7 +3,7 @@ FROM --platform=$TARGETOS/$TARGETARCH node:16-bullseye-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 \ + && apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential libtool \ && npm -g install npm@latest \ && useradd -m -d /home/container container From dc1e8d8bf3955c0246670b1b0e867bf94bf09d36 Mon Sep 17 00:00:00 2001 From: Ethan Adams Date: Wed, 8 Dec 2021 14:11:26 -0500 Subject: [PATCH 05/10] Added libtool installation to Node.js 15 docker file --- nodejs/15/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nodejs/15/Dockerfile b/nodejs/15/Dockerfile index 9aed52b..c867605 100644 --- a/nodejs/15/Dockerfile +++ b/nodejs/15/Dockerfile @@ -3,7 +3,7 @@ FROM --platform=$TARGETOS/$TARGETARCH node:15-bullseye-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 \ + && apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential libtool \ && npm -g install npm@latest \ && useradd -m -d /home/container container From 0ac02a5c42c23783fdf03a334707d8b42cb7defa Mon Sep 17 00:00:00 2001 From: Ethan Adams Date: Wed, 8 Dec 2021 14:12:06 -0500 Subject: [PATCH 06/10] Added libtool installation to Node.js 14 docker file --- nodejs/14/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nodejs/14/Dockerfile b/nodejs/14/Dockerfile index 63eca05..d5ac2ec 100644 --- a/nodejs/14/Dockerfile +++ b/nodejs/14/Dockerfile @@ -3,7 +3,7 @@ FROM --platform=$TARGETOS/$TARGETARCH node:14-bullseye-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 \ + && apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential libtool \ && npm -g install npm@latest \ && useradd -m -d /home/container container From 7e55c3b6abb3ab8afc877409f602b319a200cc6e Mon Sep 17 00:00:00 2001 From: Ethan Adams Date: Wed, 8 Dec 2021 14:12:43 -0500 Subject: [PATCH 07/10] Added libtool installation to Node.js 12 docker file --- nodejs/12/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nodejs/12/Dockerfile b/nodejs/12/Dockerfile index 2ae9d90..da1ae9b 100644 --- a/nodejs/12/Dockerfile +++ b/nodejs/12/Dockerfile @@ -3,7 +3,7 @@ FROM --platform=$TARGETOS/$TARGETARCH node:12-bullseye-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 \ + && apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential libtool \ && npm -g install npm@latest \ && useradd -m -d /home/container container From 8c996953d9fc64ec4820455798e9e5cb74beacb1 Mon Sep 17 00:00:00 2001 From: Ethan Adams Date: Wed, 8 Dec 2021 20:33:37 -0500 Subject: [PATCH 08/10] Update nodejs.yml --- .github/workflows/nodejs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 09c9c33..2d35c6f 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -41,4 +41,4 @@ jobs: platforms: linux/amd64,linux/arm64 push: true tags: | - ghcr.io/parkervcp/yolks:nodejs_${{ matrix.tag }} + ghcr.io/Ethanadams642/yolks:nodejs_${{ matrix.tag }} From fcfbe573e3d143611252d2389f6288df818d1059 Mon Sep 17 00:00:00 2001 From: Ethan Adams Date: Wed, 8 Dec 2021 20:40:48 -0500 Subject: [PATCH 09/10] Update nodejs.yml --- .github/workflows/nodejs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 2d35c6f..42b0f2c 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -41,4 +41,4 @@ jobs: platforms: linux/amd64,linux/arm64 push: true tags: | - ghcr.io/Ethanadams642/yolks:nodejs_${{ matrix.tag }} + ghcr.io/ethanadams642/yolks:nodejs_${{ matrix.tag }} From 341204d6737235ce8cc53aeb65d62b5aca8b470c Mon Sep 17 00:00:00 2001 From: Ethan Adams Date: Mon, 13 Dec 2021 10:39:02 -0500 Subject: [PATCH 10/10] Reverted build username --- .github/workflows/nodejs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 42b0f2c..09c9c33 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -41,4 +41,4 @@ jobs: platforms: linux/amd64,linux/arm64 push: true tags: | - ghcr.io/ethanadams642/yolks:nodejs_${{ matrix.tag }} + ghcr.io/parkervcp/yolks:nodejs_${{ matrix.tag }}