From e276d9d73cbdd32538531da3950bec419814d031 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 24 Aug 2021 21:19:28 +0300 Subject: [PATCH 01/51] docs(dotnet): Fix stupid github workflow versioning Github ignores subversions if they contain zero. Smart. --- .github/workflows/dotnet.yml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 8def61e..f9caea9 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -19,7 +19,7 @@ jobs: tag: - 2.1 - 3.1 - - 5.0 + - 5 steps: - uses: actions/checkout@v2 - uses: docker/setup-buildx-action@v1 diff --git a/README.md b/README.md index 2ac804b..c9a6ab7 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ is tagged correctly. * [`dotnet3.1`](/dotnet/3.1) * `ghcr.io/parkervcp/yolks:dotnet_3.1` * [`dotnet5.0`](/dotnet/5.0) - * `ghcr.io/parkervcp/yolks:dotnet_5.0` + * `ghcr.io/parkervcp/yolks:dotnet_5` ### [Erlang](/erlang) * [`erlang22`](/erlang/22) * `ghcr.io/parkervcp/yolks:erlang_22` From 5480ec769cbe4e2ca101e5b057ba789e85dedf29 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 5 Oct 2021 17:05:09 +0300 Subject: [PATCH 02/51] image(nodejs): add build-essential, tar and curl --- nodejs/12/Dockerfile | 2 +- nodejs/14/Dockerfile | 2 +- nodejs/15/Dockerfile | 2 +- nodejs/16/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nodejs/12/Dockerfile b/nodejs/12/Dockerfile index 88c6b21..9e0cfb8 100644 --- a/nodejs/12/Dockerfile +++ b/nodejs/12/Dockerfile @@ -3,7 +3,7 @@ FROM node:12-buster-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 \ + && apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential \ && useradd -m -d /home/container container USER container diff --git a/nodejs/14/Dockerfile b/nodejs/14/Dockerfile index 4306113..a9e5c91 100644 --- a/nodejs/14/Dockerfile +++ b/nodejs/14/Dockerfile @@ -3,7 +3,7 @@ FROM node:14-buster-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 \ + && apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential \ && useradd -m -d /home/container container USER container diff --git a/nodejs/15/Dockerfile b/nodejs/15/Dockerfile index 43cf02c..9dc2635 100644 --- a/nodejs/15/Dockerfile +++ b/nodejs/15/Dockerfile @@ -3,7 +3,7 @@ FROM node:15-buster-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 \ + && apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential \ && useradd -m -d /home/container container USER container diff --git a/nodejs/16/Dockerfile b/nodejs/16/Dockerfile index 4eb64b0..21ef936 100644 --- a/nodejs/16/Dockerfile +++ b/nodejs/16/Dockerfile @@ -3,7 +3,7 @@ FROM node:16-buster-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 \ + && apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential \ && useradd -m -d /home/container container USER container From 69afcac64cc9c72a3cd118d72a1f50a49edf1f0b Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 5 Oct 2021 17:06:47 +0300 Subject: [PATCH 03/51] ci: fix nodejs workflow on push --- .github/workflows/nodejs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 9beb749..22b65ec 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -6,7 +6,7 @@ on: branches: - master paths: - - nodejs/* + - nodejs/** jobs: push: name: "yolks:nodejs_${{ matrix.tag }}" @@ -37,4 +37,4 @@ jobs: platforms: linux/amd64 push: true tags: | - ghcr.io/parkervcp/yolks:nodejs_${{ matrix.tag }} \ No newline at end of file + ghcr.io/parkervcp/yolks:nodejs_${{ matrix.tag }} From c2d71fa98892d8ad7ac4615d793ac72754438b58 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 5 Oct 2021 17:07:58 +0300 Subject: [PATCH 04/51] ci: enable manual workflow dispatch --- .github/workflows/base.yml | 1 + .github/workflows/bot.yml | 1 + .github/workflows/cassandra.yml | 1 + .github/workflows/dotnet.yml | 3 +-- .github/workflows/erlang.yml | 1 + .github/workflows/games.yml | 3 ++- .github/workflows/go.yml | 3 ++- .github/workflows/installers.yml | 3 ++- .github/workflows/java.yml | 3 ++- .github/workflows/nodejs.yml | 1 + .github/workflows/python.yml | 3 ++- .github/workflows/voice.yml | 2 +- 12 files changed, 17 insertions(+), 8 deletions(-) diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml index 603be73..98f8534 100644 --- a/.github/workflows/base.yml +++ b/.github/workflows/base.yml @@ -1,5 +1,6 @@ name: build oses on: + workflow_dispatch: schedule: - cron: "0 0 * * 1" push: diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml index 5dc539c..64b883f 100644 --- a/.github/workflows/bot.yml +++ b/.github/workflows/bot.yml @@ -1,5 +1,6 @@ name: build bot on: + workflow_dispatch: schedule: - cron: "0 0 * * 1" push: diff --git a/.github/workflows/cassandra.yml b/.github/workflows/cassandra.yml index 1d61259..69ecb78 100644 --- a/.github/workflows/cassandra.yml +++ b/.github/workflows/cassandra.yml @@ -1,5 +1,6 @@ name: build cassandra on: + workflow_dispatch: schedule: - cron: "0 0 * * 1" push: diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index f9caea9..76b289e 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -1,7 +1,6 @@ name: build dotnet on: - # Allows you to run this workflow manually from the Actions tab - # workflow_dispatch: + workflow_dispatch: schedule: - cron: "0 0 * * 1" push: diff --git a/.github/workflows/erlang.yml b/.github/workflows/erlang.yml index c67aea0..6cd1412 100644 --- a/.github/workflows/erlang.yml +++ b/.github/workflows/erlang.yml @@ -1,5 +1,6 @@ name: build erlang on: + workflow_dispatch: schedule: - cron: "0 0 * * 1" push: diff --git a/.github/workflows/games.yml b/.github/workflows/games.yml index 6d95474..fbd105b 100644 --- a/.github/workflows/games.yml +++ b/.github/workflows/games.yml @@ -1,5 +1,6 @@ name: build games on: + workflow_dispatch: schedule: - cron: "0 0 * * 1" push: @@ -36,4 +37,4 @@ jobs: platforms: linux/amd64 push: true tags: | - ghcr.io/parkervcp/games:${{ matrix.game }} \ No newline at end of file + ghcr.io/parkervcp/games:${{ matrix.game }} diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 1b39e18..66e9744 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -1,5 +1,6 @@ name: build go on: + workflow_dispatch: schedule: - cron: "0 0 * * 1" push: @@ -36,4 +37,4 @@ jobs: platforms: linux/amd64 push: true tags: | - ghcr.io/parkervcp/yolks:go_${{ matrix.tag }} \ No newline at end of file + ghcr.io/parkervcp/yolks:go_${{ matrix.tag }} diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index ad09ccf..81eff14 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -1,5 +1,6 @@ name: build installers on: + workflow_dispatch: schedule: - cron: "0 0 * * 1" push: @@ -35,4 +36,4 @@ jobs: platforms: linux/amd64 push: true tags: | - ghcr.io/parkervcp/installers:${{ matrix.tag }} \ No newline at end of file + ghcr.io/parkervcp/installers:${{ matrix.tag }} diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index ff9362c..74ecd11 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -1,5 +1,6 @@ name: build java on: + workflow_dispatch: schedule: - cron: "0 0 * * 1" push: @@ -40,4 +41,4 @@ jobs: platforms: linux/amd64,linux/arm64 push: true tags: | - ghcr.io/parkervcp/yolks:java_${{ matrix.tag }} \ No newline at end of file + ghcr.io/parkervcp/yolks:java_${{ matrix.tag }} diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 22b65ec..2db42d2 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -1,5 +1,6 @@ name: build nodejs on: + workflow_dispatch: schedule: - cron: "0 0 * * 1" push: diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 4eea5a7..b59545b 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -1,5 +1,6 @@ name: build python on: + workflow_dispatch: schedule: - cron: "0 0 * * 1" push: @@ -37,4 +38,4 @@ jobs: platforms: linux/amd64 push: true tags: | - ghcr.io/parkervcp/yolks:python_${{ matrix.tag }} \ No newline at end of file + ghcr.io/parkervcp/yolks:python_${{ matrix.tag }} diff --git a/.github/workflows/voice.yml b/.github/workflows/voice.yml index 719103e..6b3250e 100644 --- a/.github/workflows/voice.yml +++ b/.github/workflows/voice.yml @@ -1,6 +1,6 @@ name: build voice on: - # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: schedule: - cron: "0 0 * * 1" push: From 58bddef7463892626921f842260823e4c23f29e6 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 10 Oct 2021 21:40:44 +0300 Subject: [PATCH 05/51] nodejs: install latest npm --- nodejs/12/Dockerfile | 3 ++- nodejs/14/Dockerfile | 3 ++- nodejs/15/Dockerfile | 3 ++- nodejs/16/Dockerfile | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/nodejs/12/Dockerfile b/nodejs/12/Dockerfile index 9e0cfb8..fa4e8a3 100644 --- a/nodejs/12/Dockerfile +++ b/nodejs/12/Dockerfile @@ -4,6 +4,7 @@ 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 \ + && npm -g install npm@latest \ && useradd -m -d /home/container container USER container @@ -11,4 +12,4 @@ ENV USER=container HOME=/home/container WORKDIR /home/container COPY ./../entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] +CMD [ "/bin/bash", "/entrypoint.sh" ] diff --git a/nodejs/14/Dockerfile b/nodejs/14/Dockerfile index a9e5c91..00fa989 100644 --- a/nodejs/14/Dockerfile +++ b/nodejs/14/Dockerfile @@ -4,6 +4,7 @@ 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 \ + && npm -g install npm@latest \ && useradd -m -d /home/container container USER container @@ -11,4 +12,4 @@ ENV USER=container HOME=/home/container WORKDIR /home/container COPY ./../entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] +CMD [ "/bin/bash", "/entrypoint.sh" ] diff --git a/nodejs/15/Dockerfile b/nodejs/15/Dockerfile index 9dc2635..7287133 100644 --- a/nodejs/15/Dockerfile +++ b/nodejs/15/Dockerfile @@ -4,6 +4,7 @@ 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 \ + && npm -g install npm@latest \ && useradd -m -d /home/container container USER container @@ -11,4 +12,4 @@ ENV USER=container HOME=/home/container WORKDIR /home/container COPY ./../entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] +CMD [ "/bin/bash", "/entrypoint.sh" ] diff --git a/nodejs/16/Dockerfile b/nodejs/16/Dockerfile index 21ef936..8b9b6f2 100644 --- a/nodejs/16/Dockerfile +++ b/nodejs/16/Dockerfile @@ -4,6 +4,7 @@ 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 \ + && npm -g install npm@latest \ && useradd -m -d /home/container container USER container @@ -11,4 +12,4 @@ ENV USER=container HOME=/home/container WORKDIR /home/container COPY ./../entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] +CMD [ "/bin/bash", "/entrypoint.sh" ] From 198e3d6fedbadab6c4ada93e3683ca4b0d7127e1 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 19 Oct 2021 19:59:37 +0300 Subject: [PATCH 06/51] fix: java image building --- java/11/Dockerfile | 2 +- java/16/Dockerfile | 2 +- java/8/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java/11/Dockerfile b/java/11/Dockerfile index 16f2e0e..7a93f06 100644 --- a/java/11/Dockerfile +++ b/java/11/Dockerfile @@ -6,7 +6,7 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk LABEL org.opencontainers.image.licenses=MIT RUN apt-get update -y \ - && apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 \ + && apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 \ && useradd -d /home/container -m container USER container diff --git a/java/16/Dockerfile b/java/16/Dockerfile index 17687aa..3d741ba 100644 --- a/java/16/Dockerfile +++ b/java/16/Dockerfile @@ -6,7 +6,7 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk LABEL org.opencontainers.image.licenses=MIT RUN apt-get update -y \ - && apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 \ + && apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 \ && useradd -d /home/container -m container USER container diff --git a/java/8/Dockerfile b/java/8/Dockerfile index e220ce6..a61c46c 100644 --- a/java/8/Dockerfile +++ b/java/8/Dockerfile @@ -6,7 +6,7 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk LABEL org.opencontainers.image.licenses=MIT RUN apt-get update -y \ - && apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 \ + && apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 \ && useradd -d /home/container -m container USER container From 4393b67ef6587962481a26e764ad18f7cef60dab Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 19 Oct 2021 20:00:25 +0300 Subject: [PATCH 07/51] ci(java): Disable openj9 builds due to missing base image --- .github/workflows/java.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index 74ecd11..ec9b276 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -17,11 +17,11 @@ jobs: matrix: tag: - 8 - - 8j9 +# - 8j9 - 11 - - 11j9 +# - 11j9 - 16 - - 16j9 +# - 16j9 steps: - uses: actions/checkout@v2 - uses: docker/setup-qemu-action@v1 From d1d8af7e929c4f799c8523e9201ce096822d1ce4 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 19 Oct 2021 20:03:47 +0300 Subject: [PATCH 08/51] feat: add python 3.10 --- .github/workflows/python.yml | 1 + README.md | 2 ++ python/3.10/Dockerfile | 14 ++++++++++++++ 3 files changed, 17 insertions(+) create mode 100644 python/3.10/Dockerfile diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index b59545b..7bf3220 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -20,6 +20,7 @@ jobs: - 3.7 - 3.8 - 3.9 + - 3.10 steps: - uses: actions/checkout@v2 - uses: docker/setup-buildx-action@v1 diff --git a/README.md b/README.md index 1f3aec5..50f9849 100644 --- a/README.md +++ b/README.md @@ -103,6 +103,8 @@ is tagged correctly. * `ghcr.io/parkervcp/yolks:python_3.8` * [`python3.9`](/python/3.9) * `ghcr.io/parkervcp/yolks:python_3.9` + * [`python3.10`](/python/3.10) + * `ghcr.io/parkervcp/yolks:python_3.10` ### [Voice](/voice) * [`TeaSpeak`](/teaspeak) * `ghcr.io/parkervcp/yolks:voice_teaspeak` diff --git a/python/3.10/Dockerfile b/python/3.10/Dockerfile new file mode 100644 index 0000000..a09e66e --- /dev/null +++ b/python/3.10/Dockerfile @@ -0,0 +1,14 @@ +FROM python:3.10-slim + +LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" + +RUN apt update \ + && apt -y install git gcc g++ ca-certificates dnsutils curl iproute2 ffmpeg procps \ + && useradd -m -d /home/container container + +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container + +COPY ./../entrypoint.sh /entrypoint.sh +CMD [ "/bin/bash", "/entrypoint.sh" ] From f87987d58bab129e27a9d1f85c60b0bcd560c6f5 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 19 Oct 2021 20:21:47 +0300 Subject: [PATCH 09/51] ci(python): Fix 3.10 build --- .github/workflows/python.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 7bf3220..b130c7b 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -16,11 +16,11 @@ jobs: fail-fast: false matrix: tag: - - 2.7 - - 3.7 - - 3.8 - - 3.9 - - 3.10 + - '2.7' + - '3.7' + - '3.8' + - '3.9' + - '3.10' steps: - uses: actions/checkout@v2 - uses: docker/setup-buildx-action@v1 From 940c33fced4c04cd60ffae2488197727937c422f Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 20 Oct 2021 20:41:56 +0300 Subject: [PATCH 10/51] feat: Add java 17 image --- .github/workflows/java.yml | 1 + README.md | 2 ++ java/17/Dockerfile | 17 +++++++++++++++++ 3 files changed, 20 insertions(+) create mode 100644 java/17/Dockerfile diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index ec9b276..80008b7 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -22,6 +22,7 @@ jobs: # - 11j9 - 16 # - 16j9 + - 17 steps: - uses: actions/checkout@v2 - uses: docker/setup-qemu-action@v1 diff --git a/README.md b/README.md index 50f9849..d54eb96 100644 --- a/README.md +++ b/README.md @@ -87,6 +87,8 @@ is tagged correctly. * `ghcr.io/parkervcp/yolks:java_14` * [`java16`](/java/16) * `ghcr.io/parkervcp/yolks:java_16` + * [`java16`](/java/17) + * `ghcr.io/parkervcp/yolks:java_17` ### [Nodejs](/nodejs) * [`node12`](/nodejs/12) * `ghcr.io/parkervcp/yolks:nodejs_12` diff --git a/java/17/Dockerfile b/java/17/Dockerfile new file mode 100644 index 0000000..129310b --- /dev/null +++ b/java/17/Dockerfile @@ -0,0 +1,17 @@ +FROM --platform=$BUILDPLATFORM openjdk:17-slim + +LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" + +LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolks" +LABEL org.opencontainers.image.licenses=MIT + +RUN apt-get update -y \ + && apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 \ + && useradd -d /home/container -m container + +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container + +COPY ./../entrypoint.sh /entrypoint.sh +CMD [ "/bin/bash", "/entrypoint.sh" ] From d6bb5e86c59b1ba7d10a9954dc7c2fe217b88e22 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 20 Oct 2021 20:45:11 +0300 Subject: [PATCH 11/51] fix: java arm64 builds --- java/11/Dockerfile | 2 +- java/11j9/Dockerfile | 2 +- java/16/Dockerfile | 2 +- java/16j9/Dockerfile | 2 +- java/17/Dockerfile | 2 +- java/8/Dockerfile | 2 +- java/8j9/Dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java/11/Dockerfile b/java/11/Dockerfile index 7a93f06..412b9d5 100644 --- a/java/11/Dockerfile +++ b/java/11/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM openjdk:11-slim +FROM --platform=$TARGETOS/$TARGETARCH openjdk:11-slim LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/java/11j9/Dockerfile b/java/11j9/Dockerfile index 6a401a5..ec6aa39 100644 --- a/java/11j9/Dockerfile +++ b/java/11j9/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk11-openj9:debianslim +FROM --platform=$TARGETOS/$TARGETARCH adoptopenjdk/openjdk11-openj9:debianslim LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/java/16/Dockerfile b/java/16/Dockerfile index 3d741ba..b25b49d 100644 --- a/java/16/Dockerfile +++ b/java/16/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM openjdk:16-slim +FROM --platform=$TARGETOS/$TARGETARCH openjdk:16-slim LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/java/16j9/Dockerfile b/java/16j9/Dockerfile index 6ae6c83..05567ea 100644 --- a/java/16j9/Dockerfile +++ b/java/16j9/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk16-openj9:debianslim +FROM --platform=$TARGETOS/$TARGETARCH adoptopenjdk/openjdk16-openj9:debianslim LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/java/17/Dockerfile b/java/17/Dockerfile index 129310b..76660de 100644 --- a/java/17/Dockerfile +++ b/java/17/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM openjdk:17-slim +FROM --platform=$TARGETOS/$TARGETARCH openjdk:17-slim LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/java/8/Dockerfile b/java/8/Dockerfile index a61c46c..83f7f46 100644 --- a/java/8/Dockerfile +++ b/java/8/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM openjdk:8-slim-buster +FROM --platform=$TARGETOS/$TARGETARCH openjdk:8-slim-buster LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/java/8j9/Dockerfile b/java/8j9/Dockerfile index 62fe586..16d8406 100644 --- a/java/8j9/Dockerfile +++ b/java/8j9/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk8-openj9:debianslim +FROM --platform=$TARGETOS/$TARGETARCH adoptopenjdk/openjdk8-openj9:debianslim LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" From b24985022ab9012bdcca6ae4258154831b723c0a Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 22 Oct 2021 14:41:47 +0300 Subject: [PATCH 12/51] feat: add Node.js 17 image --- .github/workflows/nodejs.yml | 1 + README.md | 2 ++ nodejs/17/Dockerfile | 15 +++++++++++++++ 3 files changed, 18 insertions(+) create mode 100644 nodejs/17/Dockerfile diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 2db42d2..130be91 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -20,6 +20,7 @@ jobs: - 14 - 15 - 16 + - 17 steps: - uses: actions/checkout@v2 - uses: docker/setup-buildx-action@v1 diff --git a/README.md b/README.md index d54eb96..c031664 100644 --- a/README.md +++ b/README.md @@ -98,6 +98,8 @@ is tagged correctly. * `ghcr.io/parkervcp/yolks:nodejs_15` * [`node16`](/nodejs/16) * `ghcr.io/parkervcp/yolks:nodejs_16` + * [`node16`](/nodejs/17) + * `ghcr.io/parkervcp/yolks:nodejs_17` ### [Python](/python) * [`python3.7`](/python/3.7) * `ghcr.io/parkervcp/yolks:python_3.7` diff --git a/nodejs/17/Dockerfile b/nodejs/17/Dockerfile new file mode 100644 index 0000000..0ea4c7d --- /dev/null +++ b/nodejs/17/Dockerfile @@ -0,0 +1,15 @@ +FROM node:17-buster-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 \ + && npm -g install npm@latest \ + && useradd -m -d /home/container container + +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container + +COPY ./../entrypoint.sh /entrypoint.sh +CMD [ "/bin/bash", "/entrypoint.sh" ] From 8ba8f2f8119872253ef2604cdaa5cc79437333c2 Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 22 Oct 2021 15:24:42 +0300 Subject: [PATCH 13/51] feat: ARM64 support for Node.js resolves #10 --- .github/workflows/nodejs.yml | 4 +++- nodejs/12/Dockerfile | 2 +- nodejs/14/Dockerfile | 2 +- nodejs/15/Dockerfile | 2 +- nodejs/16/Dockerfile | 2 +- nodejs/17/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 130be91..09c9c33 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -23,6 +23,8 @@ jobs: - 17 steps: - uses: actions/checkout@v2 + # Setup QEMU for ARM64 Build + - uses: docker/setup-qemu-action@v1 - uses: docker/setup-buildx-action@v1 with: version: "v0.5.1" @@ -36,7 +38,7 @@ jobs: with: context: ./nodejs file: ./nodejs/${{ matrix.tag }}/Dockerfile - platforms: linux/amd64 + platforms: linux/amd64,linux/arm64 push: true tags: | ghcr.io/parkervcp/yolks:nodejs_${{ matrix.tag }} diff --git a/nodejs/12/Dockerfile b/nodejs/12/Dockerfile index fa4e8a3..45e80bd 100644 --- a/nodejs/12/Dockerfile +++ b/nodejs/12/Dockerfile @@ -1,4 +1,4 @@ -FROM node:12-buster-slim +FROM --platform=$TARGETOS/$TARGETARCH node:12-buster-slim LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/nodejs/14/Dockerfile b/nodejs/14/Dockerfile index 00fa989..634402c 100644 --- a/nodejs/14/Dockerfile +++ b/nodejs/14/Dockerfile @@ -1,4 +1,4 @@ -FROM node:14-buster-slim +FROM --platform=$TARGETOS/$TARGETARCH node:14-buster-slim LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/nodejs/15/Dockerfile b/nodejs/15/Dockerfile index 7287133..6d9b491 100644 --- a/nodejs/15/Dockerfile +++ b/nodejs/15/Dockerfile @@ -1,4 +1,4 @@ -FROM node:15-buster-slim +FROM --platform=$TARGETOS/$TARGETARCH node:15-buster-slim LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/nodejs/16/Dockerfile b/nodejs/16/Dockerfile index 8b9b6f2..b09c15f 100644 --- a/nodejs/16/Dockerfile +++ b/nodejs/16/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16-buster-slim +FROM --platform=$TARGETOS/$TARGETARCH node:16-buster-slim LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/nodejs/17/Dockerfile b/nodejs/17/Dockerfile index 0ea4c7d..f8c6257 100644 --- a/nodejs/17/Dockerfile +++ b/nodejs/17/Dockerfile @@ -1,4 +1,4 @@ -FROM node:17-buster-slim +FROM --platform=$TARGETOS/$TARGETARCH node:17-buster-slim LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" From 7b66879352752c3cfa7d74907918026261164b64 Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 22 Oct 2021 15:30:43 +0300 Subject: [PATCH 14/51] feat: ARM64 support for Python --- .github/workflows/python.yml | 4 +++- python/2.7/Dockerfile | 2 +- python/3.10/Dockerfile | 2 +- python/3.7/Dockerfile | 2 +- python/3.8/Dockerfile | 2 +- python/3.9/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index b130c7b..96892de 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -23,6 +23,8 @@ jobs: - '3.10' steps: - uses: actions/checkout@v2 + # Setup QEMU for ARM64 Build + - uses: docker/setup-qemu-action@v1 - uses: docker/setup-buildx-action@v1 with: version: "v0.5.1" @@ -36,7 +38,7 @@ jobs: with: context: ./python file: ./python/${{ matrix.tag }}/Dockerfile - platforms: linux/amd64 + platforms: linux/amd64,linux/arm64 push: true tags: | ghcr.io/parkervcp/yolks:python_${{ matrix.tag }} diff --git a/python/2.7/Dockerfile b/python/2.7/Dockerfile index 798f58f..bcfac0d 100644 --- a/python/2.7/Dockerfile +++ b/python/2.7/Dockerfile @@ -1,4 +1,4 @@ -FROM python:2.7-slim +FROM --platform=$TARGETOS/$TARGETARCH python:2.7-slim LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/python/3.10/Dockerfile b/python/3.10/Dockerfile index a09e66e..5f6d9f3 100644 --- a/python/3.10/Dockerfile +++ b/python/3.10/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim +FROM --platform=$TARGETOS/$TARGETARCH python:3.10-slim LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/python/3.7/Dockerfile b/python/3.7/Dockerfile index c361acb..bad33ac 100644 --- a/python/3.7/Dockerfile +++ b/python/3.7/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.7-slim +FROM --platform=$TARGETOS/$TARGETARCH python:3.7-slim LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/python/3.8/Dockerfile b/python/3.8/Dockerfile index 7168292..dae396d 100644 --- a/python/3.8/Dockerfile +++ b/python/3.8/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.8-slim +FROM --platform=$TARGETOS/$TARGETARCH python:3.8-slim LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/python/3.9/Dockerfile b/python/3.9/Dockerfile index 24c1ac0..e9843f8 100644 --- a/python/3.9/Dockerfile +++ b/python/3.9/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.9-slim +FROM --platform=$TARGETOS/$TARGETARCH python:3.9-slim LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" From c69ecc02b2e38bec32745595df509fb4d024d223 Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Fri, 5 Nov 2021 14:57:00 -0700 Subject: [PATCH 15/51] [games] Add sleep to source image (#14) Sleep for 1 second before proceeding with steamcmd update to make sure it doesn't deadlock --- games/source/entrypoint.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/games/source/entrypoint.sh b/games/source/entrypoint.sh index b04e3c6..c0aa5ed 100644 --- a/games/source/entrypoint.sh +++ b/games/source/entrypoint.sh @@ -22,6 +22,9 @@ # SOFTWARE. # +# Wait for the container to fully initialize +sleep 1 + # Default the TZ environment variable to UTC. TZ=${TZ:-UTC} export TZ From 32ae4fa67cdc6396b1f6bd664a662ecf36a8decf Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sat, 6 Nov 2021 11:27:02 +0100 Subject: [PATCH 16/51] Fixed a little typo (#15) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c031664..7a5e424 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ is tagged correctly. * `ghcr.io/parkervcp/yolks:java_14` * [`java16`](/java/16) * `ghcr.io/parkervcp/yolks:java_16` - * [`java16`](/java/17) + * [`java17`](/java/17) * `ghcr.io/parkervcp/yolks:java_17` ### [Nodejs](/nodejs) * [`node12`](/nodejs/12) From 5e9841ebad0b12fd4ecbaf86ec0c1a3377fe862b Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Tue, 9 Nov 2021 19:21:55 +0100 Subject: [PATCH 17/51] feat: Add dotnet6 (#16) --- .github/workflows/dotnet.yml | 1 + README.md | 4 +++- dotnet/6/Dockerfile | 21 +++++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 dotnet/6/Dockerfile diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 76b289e..d7859d2 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -19,6 +19,7 @@ jobs: - 2.1 - 3.1 - 5 + - 6 steps: - uses: actions/checkout@v2 - uses: docker/setup-buildx-action@v1 diff --git a/README.md b/README.md index 7a5e424..f477ab9 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,9 @@ is tagged correctly. * [`dotnet3.1`](/dotnet/3.1) * `ghcr.io/parkervcp/yolks:dotnet_3.1` * [`dotnet5.0`](/dotnet/5.0) - * `ghcr.io/parkervcp/yolks:dotnet_5` + * `ghcr.io/parkervcp/yolks:dotnet_5` + * [`dotnet6.0`](/dotnet/5.0) + * `ghcr.io/parkervcp/yolks:dotnet_6` ### [Erlang](/erlang) * [`erlang22`](/erlang/22) * `ghcr.io/parkervcp/yolks:erlang_22` diff --git a/dotnet/6/Dockerfile b/dotnet/6/Dockerfile new file mode 100644 index 0000000..8731c4c --- /dev/null +++ b/dotnet/6/Dockerfile @@ -0,0 +1,21 @@ +FROM --platform=$BUILDPLATFORM ghcr.io/parkervcp/yolks:debian + +LABEL author="Torsten Widmann" maintainer="info@goover.de" + +ENV DEBIAN_FRONTEND noninteractive + +RUN apt update -y \ + && apt upgrade -y \ + && apt install -y apt-transport-https wget iproute2 \ + && wget https://packages.microsoft.com/config/debian/10/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ + && dpkg -i packages-microsoft-prod.deb \ + && rm packages-microsoft-prod.deb \ + && apt update -y \ + && apt install -y aspnetcore-runtime-6.0 libgdiplus + +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container + +COPY ./../entrypoint.sh /entrypoint.sh +CMD [ "/bin/bash", "/entrypoint.sh" ] From 1788debd03d46ed487ead0d9bda288b5083d31e4 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Tue, 9 Nov 2021 19:57:32 +0100 Subject: [PATCH 18/51] docs(readme): fix dotnet 6 link (#17) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f477ab9..84dc309 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ is tagged correctly. * `ghcr.io/parkervcp/yolks:dotnet_3.1` * [`dotnet5.0`](/dotnet/5.0) * `ghcr.io/parkervcp/yolks:dotnet_5` - * [`dotnet6.0`](/dotnet/5.0) + * [`dotnet6.0`](/dotnet/6.0) * `ghcr.io/parkervcp/yolks:dotnet_6` ### [Erlang](/erlang) * [`erlang22`](/erlang/22) From 5bbef80956cee18e7cc6b7d944867a43ce54f1b9 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Fri, 12 Nov 2021 12:04:16 +0100 Subject: [PATCH 19/51] Add mono latest and libfreetype6 to java (#18) Changes codestyle of Java images --- .github/workflows/mono.yml | 38 ++++++++++++++++++++++++++++++++++++++ README.md | 9 +++++---- java/11/Dockerfile | 6 +++--- java/11j9/Dockerfile | 6 +++--- java/16/Dockerfile | 6 +++--- java/16j9/Dockerfile | 6 +++--- java/17/Dockerfile | 6 +++--- java/8/Dockerfile | 6 +++--- java/8j9/Dockerfile | 6 +++--- mono/entrypoint.sh | 12 ++++++++++++ mono/latest/Dockerfile | 22 ++++++++++++++++++++++ 11 files changed, 98 insertions(+), 25 deletions(-) create mode 100644 .github/workflows/mono.yml create mode 100644 mono/entrypoint.sh create mode 100644 mono/latest/Dockerfile diff --git a/.github/workflows/mono.yml b/.github/workflows/mono.yml new file mode 100644 index 0000000..749e28c --- /dev/null +++ b/.github/workflows/mono.yml @@ -0,0 +1,38 @@ +name: build mono +on: + workflow_dispatch: + schedule: + - cron: "0 0 * * 1" + push: + branches: + - master + paths: + - mono/** +jobs: + push: + name: "yolks:mono_${{ matrix.tag }}" + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + tag: + - latest + steps: + - uses: actions/checkout@v2 + - uses: docker/setup-buildx-action@v1 + with: + version: "v0.5.1" + buildkitd-flags: --debug + - uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.REGISTRY_TOKEN }} + - uses: docker/build-push-action@v2 + with: + context: ./mono + file: ./mono/${{ matrix.tag }}/Dockerfile + platforms: linux/amd64 + push: true + tags: | + ghcr.io/parkervcp/yolks:mono_${{ matrix.tag }} diff --git a/README.md b/README.md index 84dc309..c9e5785 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,10 @@ is tagged correctly. * [`java16`](/java/16) * `ghcr.io/parkervcp/yolks:java_16` * [`java17`](/java/17) - * `ghcr.io/parkervcp/yolks:java_17` + * `ghcr.io/parkervcp/yolks:java_17` +### [Mono](/mono) + * [`mono_latest`](/mono/latest) + * `ghcr.io/parkervcp/yolks:mono_latest` ### [Nodejs](/nodejs) * [`node12`](/nodejs/12) * `ghcr.io/parkervcp/yolks:nodejs_12` @@ -100,7 +103,7 @@ is tagged correctly. * `ghcr.io/parkervcp/yolks:nodejs_15` * [`node16`](/nodejs/16) * `ghcr.io/parkervcp/yolks:nodejs_16` - * [`node16`](/nodejs/17) + * [`node17`](/nodejs/17) * `ghcr.io/parkervcp/yolks:nodejs_17` ### [Python](/python) * [`python3.7`](/python/3.7) @@ -115,9 +118,7 @@ is tagged correctly. * [`TeaSpeak`](/teaspeak) * `ghcr.io/parkervcp/yolks:voice_teaspeak` ### [Installation Images](/installers) - * [`alpine-install`](/installers/alpine) * `ghcr.io/parkervcp/installers:alpine` - * [`debian-install`](/installers/debian) * `ghcr.io/parkervcp/installers:debian` diff --git a/java/11/Dockerfile b/java/11/Dockerfile index 412b9d5..deeca3d 100644 --- a/java/11/Dockerfile +++ b/java/11/Dockerfile @@ -5,9 +5,9 @@ LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolks" LABEL org.opencontainers.image.licenses=MIT -RUN apt-get update -y \ - && apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 \ - && useradd -d /home/container -m container +RUN apt update -y \ + && apt install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \ + && useradd -d /home/container -m container USER container ENV USER=container HOME=/home/container diff --git a/java/11j9/Dockerfile b/java/11j9/Dockerfile index ec6aa39..e7ec1e9 100644 --- a/java/11j9/Dockerfile +++ b/java/11j9/Dockerfile @@ -2,9 +2,9 @@ FROM --platform=$TARGETOS/$TARGETARCH adoptopenjdk/openjdk11-openj9:debia LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" -RUN apt-get update -y \ - && apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 \ - && useradd -d /home/container -m container +RUN apt update -y \ + && apt install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \ + && useradd -d /home/container -m container USER container ENV USER=container HOME=/home/container diff --git a/java/16/Dockerfile b/java/16/Dockerfile index b25b49d..e1afe37 100644 --- a/java/16/Dockerfile +++ b/java/16/Dockerfile @@ -5,9 +5,9 @@ LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolks" LABEL org.opencontainers.image.licenses=MIT -RUN apt-get update -y \ - && apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 \ - && useradd -d /home/container -m container +RUN apt update -y \ + && apt install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \ + && useradd -d /home/container -m container USER container ENV USER=container HOME=/home/container diff --git a/java/16j9/Dockerfile b/java/16j9/Dockerfile index 05567ea..306ca7c 100644 --- a/java/16j9/Dockerfile +++ b/java/16j9/Dockerfile @@ -2,9 +2,9 @@ FROM --platform=$TARGETOS/$TARGETARCH adoptopenjdk/openjdk16-openj9:debia LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" -RUN apt-get update -y \ - && apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 \ - && useradd -d /home/container -m container +RUN apt update -y \ + && apt install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \ + && useradd -d /home/container -m container USER container ENV USER=container HOME=/home/container diff --git a/java/17/Dockerfile b/java/17/Dockerfile index 76660de..2fa7efa 100644 --- a/java/17/Dockerfile +++ b/java/17/Dockerfile @@ -5,9 +5,9 @@ LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolks" LABEL org.opencontainers.image.licenses=MIT -RUN apt-get update -y \ - && apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 \ - && useradd -d /home/container -m container +RUN apt update -y \ + && apt install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \ + && useradd -d /home/container -m container USER container ENV USER=container HOME=/home/container diff --git a/java/8/Dockerfile b/java/8/Dockerfile index 83f7f46..7bd75a1 100644 --- a/java/8/Dockerfile +++ b/java/8/Dockerfile @@ -5,9 +5,9 @@ LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolks" LABEL org.opencontainers.image.licenses=MIT -RUN apt-get update -y \ - && apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 \ - && useradd -d /home/container -m container +RUN apt update -y \ + && apt install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \ + && useradd -d /home/container -m container USER container ENV USER=container HOME=/home/container diff --git a/java/8j9/Dockerfile b/java/8j9/Dockerfile index 16d8406..590623f 100644 --- a/java/8j9/Dockerfile +++ b/java/8j9/Dockerfile @@ -2,9 +2,9 @@ FROM --platform=$TARGETOS/$TARGETARCH adoptopenjdk/openjdk8-openj9:debian LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" -RUN apt-get update -y \ - && apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 \ - && useradd -d /home/container -m container +RUN apt update -y \ + && apt install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 libfreetype6 \ + && useradd -d /home/container -m container USER container ENV USER=container HOME=/home/container diff --git a/mono/entrypoint.sh b/mono/entrypoint.sh new file mode 100644 index 0000000..ef6ae2e --- /dev/null +++ b/mono/entrypoint.sh @@ -0,0 +1,12 @@ +#!/bin/bash +cd /home/container + +# Make internal Docker IP address available to processes. +export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` + +# Replace Startup Variables +MODIFIED_STARTUP="eval $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')" +echo ":/home/container$ ${MODIFIED_STARTUP}" + +# Run the Server +${MODIFIED_STARTUP} diff --git a/mono/latest/Dockerfile b/mono/latest/Dockerfile new file mode 100644 index 0000000..041d65a --- /dev/null +++ b/mono/latest/Dockerfile @@ -0,0 +1,22 @@ +# ---------------------------------- +# Mono Latest Image +# Minimum Panel Version: 1.2.x +# ---------------------------------- +FROM ghcr.io/parkervcp/yolks:debian + +LABEL author="Torsten Widmann" maintainer="support@goover.de" + +RUN apt update \ + && apt -y upgrade +RUN apt install -y fontconfig dirmngr +RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF +RUN sh -c 'echo "deb https://download.mono-project.com/repo/debian stable-buster main" > /etc/apt/sources.list.d/mono-official-stable.list' +RUN apt update +RUN apt install mono-complete -y + +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container + +COPY ./entrypoint.sh /entrypoint.sh +CMD ["/bin/bash", "/entrypoint.sh"] From 56e01559dc865401e7611e93d168680e61f5e9a4 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Mon, 15 Nov 2021 09:53:41 +0100 Subject: [PATCH 20/51] add missing workdir (#19) --- oses/ubuntu/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/oses/ubuntu/Dockerfile b/oses/ubuntu/Dockerfile index 6a4b4f8..6b3f63d 100644 --- a/oses/ubuntu/Dockerfile +++ b/oses/ubuntu/Dockerfile @@ -20,5 +20,7 @@ RUN apt install -y gcc g++ libgcc1 lib32gcc1 libc++-dev gdb libc6 git wget cur RUN update-locale lang=en_US.UTF-8 \ && dpkg-reconfigure --frontend noninteractive locales +WORKDIR /home/container + COPY ./entrypoint.sh /entrypoint.sh CMD ["/bin/bash", "/entrypoint.sh"] From 7185d6820e24724190888e9ad45da1ac583cefe3 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 18 Nov 2021 21:38:10 +0200 Subject: [PATCH 21/51] feat: add unzip zip tar jq --- installers/debian/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installers/debian/Dockerfile b/installers/debian/Dockerfile index 6c3568c..e671c61 100644 --- a/installers/debian/Dockerfile +++ b/installers/debian/Dockerfile @@ -32,4 +32,4 @@ ENV DEBIAN_FRONTEND=noninteractive RUN dpkg --add-architecture i386 \ && apt update \ && apt upgrade -y \ - && apt -y --no-install-recommends install ca-certificates curl lib32gcc-s1 libsdl2-2.0-0:i386 git + && apt -y --no-install-recommends install ca-certificates curl lib32gcc-s1 libsdl2-2.0-0:i386 git unzip zip tar jq From cd85cfd68cad9953ca481136abdbe2772fcdf7e6 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 20 Nov 2021 00:18:03 +0200 Subject: [PATCH 22/51] docs(readme): Fix dotnet links --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c9e5785..af582cc 100644 --- a/README.md +++ b/README.md @@ -51,9 +51,9 @@ is tagged correctly. * `ghcr.io/parkervcp/yolks:dotnet_2.1` * [`dotnet3.1`](/dotnet/3.1) * `ghcr.io/parkervcp/yolks:dotnet_3.1` - * [`dotnet5.0`](/dotnet/5.0) + * [`dotnet5.0`](/dotnet/5) * `ghcr.io/parkervcp/yolks:dotnet_5` - * [`dotnet6.0`](/dotnet/6.0) + * [`dotnet6.0`](/dotnet/6) * `ghcr.io/parkervcp/yolks:dotnet_6` ### [Erlang](/erlang) * [`erlang22`](/erlang/22) From 990b4fabab6ea6bc6a3a1a333555630d71688a94 Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Fri, 19 Nov 2021 19:27:07 -0800 Subject: [PATCH 23/51] Source's entrypoint.sh SteamCMD fix SteamCMD apparently put an update out today that now displays a warning if `+force_install_dir` is after `+login`. This removes the error from appearing. --- games/source/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games/source/entrypoint.sh b/games/source/entrypoint.sh index c0aa5ed..eabbe6e 100644 --- a/games/source/entrypoint.sh +++ b/games/source/entrypoint.sh @@ -56,7 +56,7 @@ fi if [ -z ${AUTO_UPDATE} ] || [ "${AUTO_UPDATE}" == "1" ]; then # Update Source Server if [ ! -z ${SRCDS_APPID} ]; then - ./steamcmd/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir /home/container +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s "-beta ${SRCDS_BETAID}" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s "-betapassword ${SRCDS_BETAPASS}" ) $( [[ -z ${HLDS_GAME} ]] || printf %s "+app_set_config 90 mod ${HLDS_GAME}" ) $( [[ -z ${VALIDATE} ]] || printf %s "validate" ) +quit + ./steamcmd/steamcmd.sh +force_install_dir /home/container +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s "-beta ${SRCDS_BETAID}" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s "-betapassword ${SRCDS_BETAPASS}" ) $( [[ -z ${HLDS_GAME} ]] || printf %s "+app_set_config 90 mod ${HLDS_GAME}" ) $( [[ -z ${VALIDATE} ]] || printf %s "validate" ) +quit else echo -e "No appid set. Starting Server" fi From ac894c3267a3560cd01ee0d0797ceae7013ba43f Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Fri, 19 Nov 2021 19:29:31 -0800 Subject: [PATCH 24/51] Arma3's entrypoint.sh SteamCMD fix SteamCMD apparently put an update out today that now displays a warning if `+force_install_dir` is after `+login`. This removes the error from appearing. --- games/arma3/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games/arma3/entrypoint.sh b/games/arma3/entrypoint.sh index be87780..ecfb182 100644 --- a/games/arma3/entrypoint.sh +++ b/games/arma3/entrypoint.sh @@ -46,7 +46,7 @@ function RunSteamCMD { #[Input: int server=0 mod=1; int id] # Check if updating server or mod if [[ $1 == 0 ]]; then # Server - ${STEAMCMD_DIR}/steamcmd.sh "+login \"${STEAM_USER}\" \"${STEAM_PASS}\"" +force_install_dir /home/container +app_update $2 $extraFlags $validateServer +quit | tee -a "${STEAMCMD_LOG}" + ${STEAMCMD_DIR}/steamcmd.sh +force_install_dir /home/container "+login \"${STEAM_USER}\" \"${STEAM_PASS}\"" +app_update $2 $extraFlags $validateServer +quit | tee -a "${STEAMCMD_LOG}" else # Mod ${STEAMCMD_DIR}/steamcmd.sh "+login \"${STEAM_USER}\" \"${STEAM_PASS}\"" +workshop_download_item $GAME_ID $2 +quit | tee -a "${STEAMCMD_LOG}" fi From 2c3c2e16152679ea865ca6b2119c3ea2e9b4dc60 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 20 Nov 2021 19:33:31 +0200 Subject: [PATCH 25/51] docs: add Wine --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index af582cc..89db575 100644 --- a/README.md +++ b/README.md @@ -116,7 +116,10 @@ is tagged correctly. * `ghcr.io/parkervcp/yolks:python_3.10` ### [Voice](/voice) * [`TeaSpeak`](/teaspeak) - * `ghcr.io/parkervcp/yolks:voice_teaspeak` + * `ghcr.io/parkervcp/yolks:voice_teaspeak` +### [Wine](/wine) + * [`Wine`](/wine) + * `ghcr.io/parkervcp/yolks:wine_latest` ### [Installation Images](/installers) * [`alpine-install`](/installers/alpine) * `ghcr.io/parkervcp/installers:alpine` From 0abb82eb91433763a99e8cb7e56d86cbd4101815 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sat, 20 Nov 2021 18:33:43 +0100 Subject: [PATCH 26/51] add wine latest (#21) --- .github/workflows/wine.yml | 38 +++++++++++++++++ wine/entrypoint.sh | 84 ++++++++++++++++++++++++++++++++++++++ wine/latest/Dockerfile | 38 +++++++++++++++++ 3 files changed, 160 insertions(+) create mode 100644 .github/workflows/wine.yml create mode 100644 wine/entrypoint.sh create mode 100644 wine/latest/Dockerfile diff --git a/.github/workflows/wine.yml b/.github/workflows/wine.yml new file mode 100644 index 0000000..de31ef9 --- /dev/null +++ b/.github/workflows/wine.yml @@ -0,0 +1,38 @@ +name: build wine +on: + workflow_dispatch: + schedule: + - cron: "0 0 * * 1" + push: + branches: + - master + paths: + - wine/** +jobs: + push: + name: "yolks:wine_${{ matrix.tag }}" + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + tag: + - latest + steps: + - uses: actions/checkout@v2 + - uses: docker/setup-buildx-action@v1 + with: + version: "v0.5.1" + buildkitd-flags: --debug + - uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.REGISTRY_TOKEN }} + - uses: docker/build-push-action@v2 + with: + context: ./wine + file: ./wine/${{ matrix.tag }}/Dockerfile + platforms: linux/amd64 + push: true + tags: | + ghcr.io/parkervcp/yolks:wine_${{ matrix.tag }} diff --git a/wine/entrypoint.sh b/wine/entrypoint.sh new file mode 100644 index 0000000..6b0ae56 --- /dev/null +++ b/wine/entrypoint.sh @@ -0,0 +1,84 @@ +#!/bin/bash +cd /home/container + +# Information output +echo "Running on Debian $(cat /etc/debian_version)" +echo "Current timezone: $(cat /etc/timezone)" +wine --version + +# Make internal Docker IP address available to processes. +export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` + +## just in case someone removed the defaults. +if [ "${STEAM_USER}" == "" ]; then + echo -e "steam user is not set.\n" + echo -e "Using anonymous user.\n" + STEAM_USER=anonymous + STEAM_PASS="" + STEAM_AUTH="" +else + echo -e "user set to ${STEAM_USER}" +fi + +## if auto_update is not set or to 1 update +if [ -z ${AUTO_UPDATE} ] || [ "${AUTO_UPDATE}" == "1" ]; then + # Update Source Server + if [ ! -z ${SRCDS_APPID} ]; then + ./steamcmd/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ "${WINDOWS_INSTALL}" == "1" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +force_install_dir /home/container +app_update ${SRCDS_APPID} $( [[ ! -z ${SRCDS_BETAID} ]] && printf %s "-beta ${SRCDS_BETAID}" ) $( [[ ! -z ${SRCDS_BETAPASS} ]] && printf %s "-betapassword ${SRCDS_BETAPASS}" ) $( [[ ! -z ${HLDS_GAME} ]] && printf %s "+app_set_config 90 mod ${HLDS_GAME}" ) $( [[ ! -z ${VALIDATE} ]] && printf %s "validate" ) +quit + else + echo -e "No appid set. Starting Server" + fi +else + echo -e "Not updating game server as auto update was set to 0. Starting Server" +fi + +if [[ $XVFB == 1 ]]; then + Xvfb :0 -screen 0 ${DISPLAY_WIDTH}x${DISPLAY_HEIGHT}x${DISPLAY_DEPTH} & +fi + +# Install necessary to run packages +echo "First launch will throw some errors. Ignore them" + +mkdir -p $WINEPREFIX + +# Check if wine-gecko required and install it if so +if [[ $WINETRICKS_RUN =~ gecko ]]; then + echo "Installing Gecko" + WINETRICKS_RUN=${WINETRICKS_RUN/gecko} + + if [ ! -f "$WINEPREFIX/gecko_x86.msi" ]; then + wget -q -O $WINEPREFIX/gecko_x86.msi http://dl.winehq.org/wine/wine-gecko/2.47.2/wine_gecko-2.47.2-x86.msi + fi + + if [ ! -f "$WINEPREFIX/gecko_x86_64.msi" ]; then + wget -q -O $WINEPREFIX/gecko_x86_64.msi http://dl.winehq.org/wine/wine-gecko/2.47.2/wine_gecko-2.47.2-x86_64.msi + fi + + wine msiexec /i $WINEPREFIX/gecko_x86.msi /qn /quiet /norestart /log $WINEPREFIX/gecko_x86_install.log + wine msiexec /i $WINEPREFIX/gecko_x86_64.msi /qn /quiet /norestart /log $WINEPREFIX/gecko_x86_64_install.log +fi + +# Check if wine-mono required and install it if so +if [[ $WINETRICKS_RUN =~ mono ]]; then + echo "Installing mono" + WINETRICKS_RUN=${WINETRICKS_RUN/mono} + + if [ ! -f "$WINEPREFIX/mono.msi" ]; then + wget -q -O $WINEPREFIX/mono.msi http://dl.winehq.org/wine/wine-mono/6.4.0/wine-mono-6.4.0-x86.msi + fi + + wine msiexec /i $WINEPREFIX/mono.msi /qn /quiet /norestart /log $WINEPREFIX/mono_install.log +fi + +# List and install other packages +for trick in $WINETRICKS_RUN; do + echo "Installing $trick" + winetricks -q $trick +done + +# Replace Startup Variables +MODIFIED_STARTUP=$(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g') +echo ":/home/container$ ${MODIFIED_STARTUP}" + +# Run the Server +eval ${MODIFIED_STARTUP} diff --git a/wine/latest/Dockerfile b/wine/latest/Dockerfile new file mode 100644 index 0000000..47a4e52 --- /dev/null +++ b/wine/latest/Dockerfile @@ -0,0 +1,38 @@ +# ---------------------------------- +# Generic Wine 6 image +# ---------------------------------- +FROM ghcr.io/parkervcp/yolks:debian + +LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" + +## install required packages +RUN dpkg --add-architecture i386 \ + && apt update -y \ + && apt install -y --no-install-recommends gnupg2 software-properties-common libntlm0 winbind xvfb xauth python3 libncurses5:i386 libncurses6:i386 + +# Install winehq-stable and with recommends +RUN wget -nc https://dl.winehq.org/wine-builds/winehq.key \ + && apt-key add winehq.key \ + && echo "deb https://dl.winehq.org/wine-builds/debian/ bullseye main" >> /etc/apt/sources.list \ + && apt update \ + && apt install -y --install-recommends winehq-stable cabextract xvfb + +# Set up Winetricks +RUN wget -q -O /usr/sbin/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \ + && chmod +x /usr/sbin/winetricks + +ENV HOME=/home/container +ENV WINEPREFIX=/home/container/.wine +ENV WINEDLLOVERRIDES="mscoree,mshtml=" +ENV DISPLAY=:0 +ENV DISPLAY_WIDTH=1024 +ENV DISPLAY_HEIGHT=768 +ENV DISPLAY_DEPTH=16 +ENV AUTO_UPDATE=1 +ENV XVFB=1 + +USER container +WORKDIR /home/container + +COPY ./entrypoint.sh /entrypoint.sh +CMD ["/bin/bash", "/entrypoint.sh"] From ac85bf789debc346ddf6bb1630e238501f3c6955 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 20 Nov 2021 19:49:03 +0200 Subject: [PATCH 27/51] add pull request template --- .github/pull_request_template.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .github/pull_request_template.md diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 0000000..3698a72 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,10 @@ +### All Submissions: + +* [ ] Have you ensured there aren't other open [Pull Requests](../pulls) for the same update or change? +* [ ] Have you created a new branch for your changes and PR from that branch and not from your master branch? +* [ ] Have you added an explanation of what your changes do and why you'd like us to include them? + +### New Image Submissions: + +1. [ ] Have you added your image to the [Github workflows](https://github.com/parkervcp/yolks/tree/master/.github/workflows)? +2. [ ] Have you updated the README list to contain your new image? \ No newline at end of file From df3be85cba9e283450cbfa2c5923cfcf58b5f580 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 21 Nov 2021 16:44:55 +0200 Subject: [PATCH 28/51] feat: use Bullseye for base Debian image resolves #23 --- oses/debian/Dockerfile | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/oses/debian/Dockerfile b/oses/debian/Dockerfile index 68978fe..92d86b9 100644 --- a/oses/debian/Dockerfile +++ b/oses/debian/Dockerfile @@ -1,30 +1,28 @@ -FROM debian:buster-slim +FROM debian:bullseye-slim -LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" +LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" -ENV DEBIAN_FRONTEND noninteractive +LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolks" +LABEL org.opencontainers.image.licenses=MIT -## add container user -RUN useradd -m -d /home/container -s /bin/bash container +ENV DEBIAN_FRONTEND noninteractive -RUN ln -s /home/container/ /nonexistent +## Update base packages +RUN apt update \ + && apt upgrade -y -ENV USER=container HOME=/home/container +## 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 -## update base packages -RUN apt update \ - && apt upgrade -y +## Configure locale +RUN update-locale lang=en_US.UTF-8 \ + && dpkg-reconfigure --frontend noninteractive locales -## 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 libicu63 icu-devtools libunwind8 libssl-dev sqlite3 libsqlite3-dev libmariadbclient-dev libduktape203 locales ffmpeg gnupg2 apt-transport-https software-properties-common ca-certificates tzdata \ - liblua5.3 libz-dev rapidjson-dev +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container -## configure locale -RUN update-locale lang=en_US.UTF-8 \ - && dpkg-reconfigure --frontend noninteractive locales - -WORKDIR /home/container - -COPY ./entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] \ No newline at end of file +COPY ./entrypoint.sh /entrypoint.sh +CMD [ "/bin/bash", "/entrypoint.sh" ] \ No newline at end of file From a4ef920a090a2723404c617b6f1acce1f7b1a790 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sun, 21 Nov 2021 16:10:36 +0100 Subject: [PATCH 29/51] fix Debian Image (#24) --- oses/debian/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/oses/debian/Dockerfile b/oses/debian/Dockerfile index 92d86b9..47a5e81 100644 --- a/oses/debian/Dockerfile +++ b/oses/debian/Dockerfile @@ -21,8 +21,9 @@ RUN update-locale lang=en_US.UTF-8 \ && dpkg-reconfigure --frontend noninteractive locales USER container -ENV USER=container HOME=/home/container +ENV USER=container +ENV HOME=/home/container WORKDIR /home/container COPY ./entrypoint.sh /entrypoint.sh -CMD [ "/bin/bash", "/entrypoint.sh" ] \ No newline at end of file +CMD [ "/bin/bash", "/entrypoint.sh" ] From 9bd45e5af0a3b1a1488cfa840be5016c3c361d1c Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 21 Nov 2021 17:20:08 +0200 Subject: [PATCH 30/51] fix: add user to Debian base --- oses/debian/Dockerfile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/oses/debian/Dockerfile b/oses/debian/Dockerfile index 47a5e81..f00009c 100644 --- a/oses/debian/Dockerfile +++ b/oses/debian/Dockerfile @@ -14,16 +14,18 @@ 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 \ + && useradd -m -d /home/container container ## Configure locale RUN update-locale lang=en_US.UTF-8 \ && dpkg-reconfigure --frontend noninteractive locales + + -USER container -ENV USER=container -ENV HOME=/home/container -WORKDIR /home/container +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container COPY ./entrypoint.sh /entrypoint.sh CMD [ "/bin/bash", "/entrypoint.sh" ] From aa054a48bf5b39bf3794bf3ca337624e3591bf3e Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 21 Nov 2021 17:44:31 +0200 Subject: [PATCH 31/51] fix: add symbolic link for user --- oses/debian/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/oses/debian/Dockerfile b/oses/debian/Dockerfile index f00009c..dcf2513 100644 --- a/oses/debian/Dockerfile +++ b/oses/debian/Dockerfile @@ -7,6 +7,10 @@ LABEL org.opencontainers.image.licenses=MIT ENV DEBIAN_FRONTEND noninteractive +RUN useradd -m -d /home/container -s /bin/bash container + +RUN ln -s /home/container/ /nonexistent + ## Update base packages RUN apt update \ && apt upgrade -y @@ -15,7 +19,6 @@ RUN apt update \ 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 \ - && useradd -m -d /home/container container ## Configure locale RUN update-locale lang=en_US.UTF-8 \ From 2afebbba5a90176125f0afb861fa08bb6f9b5823 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 21 Nov 2021 17:47:25 +0200 Subject: [PATCH 32/51] fix: move user env to the beginning --- oses/debian/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/oses/debian/Dockerfile b/oses/debian/Dockerfile index dcf2513..6d3a9f4 100644 --- a/oses/debian/Dockerfile +++ b/oses/debian/Dockerfile @@ -11,6 +11,8 @@ RUN useradd -m -d /home/container -s /bin/bash container RUN ln -s /home/container/ /nonexistent +ENV USER=container HOME=/home/container + ## Update base packages RUN apt update \ && apt upgrade -y @@ -24,10 +26,7 @@ RUN apt install -y gcc g++ libgcc1 lib32gcc-s1 libc++-dev gdb libc6 git RUN update-locale lang=en_US.UTF-8 \ && dpkg-reconfigure --frontend noninteractive locales - -USER container -ENV USER=container HOME=/home/container WORKDIR /home/container COPY ./entrypoint.sh /entrypoint.sh From 5b70a1917099f2649a33da0d5bc1f451b349e11a Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 21 Nov 2021 17:48:20 +0200 Subject: [PATCH 33/51] fix: package new line installation --- oses/debian/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oses/debian/Dockerfile b/oses/debian/Dockerfile index 6d3a9f4..c9a27ea 100644 --- a/oses/debian/Dockerfile +++ b/oses/debian/Dockerfile @@ -11,7 +11,7 @@ RUN useradd -m -d /home/container -s /bin/bash container RUN ln -s /home/container/ /nonexistent -ENV USER=container HOME=/home/container +ENV USER=container HOME=/home/container ## Update base packages RUN apt update \ @@ -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 ## Configure locale RUN update-locale lang=en_US.UTF-8 \ From 7f9cd3c581533444d2ceb59763321d33df5b99ca Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Wed, 24 Nov 2021 20:26:54 +0100 Subject: [PATCH 34/51] Add additional Repos for Wine (#25) --- wine/latest/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wine/latest/Dockerfile b/wine/latest/Dockerfile index 47a4e52..7ab8e30 100644 --- a/wine/latest/Dockerfile +++ b/wine/latest/Dockerfile @@ -14,8 +14,10 @@ RUN dpkg --add-architecture i386 \ RUN wget -nc https://dl.winehq.org/wine-builds/winehq.key \ && apt-key add winehq.key \ && echo "deb https://dl.winehq.org/wine-builds/debian/ bullseye main" >> /etc/apt/sources.list \ + && wget -O- -q download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_11/Release.key | apt-key add - \ + && echo "deb http://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_11 ./" | tee /etc/apt/sources.list.d/wine-obs.list \ && apt update \ - && apt install -y --install-recommends winehq-stable cabextract xvfb + && apt install -y --install-recommends winehq-stable cabextract xvfb # Set up Winetricks RUN wget -q -O /usr/sbin/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \ From eaedc9408a9e54fd515b84a947ce1c5face0298a Mon Sep 17 00:00:00 2001 From: Fernando De Lucchi <69133647+fdelucchijr@users.noreply.github.com> Date: Wed, 24 Nov 2021 20:27:05 -0500 Subject: [PATCH 35/51] ci(bots): ARM64 support and layer caching (#26) --- .github/workflows/bot.yml | 50 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml index 64b883f..6eae438 100644 --- a/.github/workflows/bot.yml +++ b/.github/workflows/bot.yml @@ -9,14 +9,13 @@ on: paths: - bot/** jobs: - push: + pushArm: name: "yolks:bot_${{ matrix.tag }}" runs-on: ubuntu-latest strategy: fail-fast: false matrix: tag: - - bastion - parkertron - red - sinusbot @@ -24,7 +23,52 @@ jobs: - uses: actions/checkout@v2 - uses: docker/setup-buildx-action@v1 with: - version: "v0.5.1" + version: "v0.7.0" + buildkitd-flags: --debug + - name: Set up QEMU + uses: docker/setup-qemu-action@master + with: + platforms: arm64,amd64 + - name: Cache Docker layers + uses: actions/cache@v2 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-buildx- + - uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.REGISTRY_TOKEN }} + - uses: docker/build-push-action@v2 + with: + context: ./bot/${{ matrix.tag }} + file: ./bot/${{ matrix.tag }}/Dockerfile + platforms: linux/amd64,linux/arm64 + cache-from: type=local,src=/tmp/.buildx-cache + cache-to: type=local,dest=/tmp/.buildx-cache-new + push: true + tags: | + ghcr.io/parkervcp/yolks:bot_${{ matrix.tag }} + - name: Move cache + run: | + rm -rf /tmp/.buildx-cache + mv /tmp/.buildx-cache-new /tmp/.buildx-cache + + pushAmd: + name: "yolks:bot_${{ matrix.tag }}" + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + tag: + - bastion + steps: + - uses: actions/checkout@v2 + - uses: docker/setup-buildx-action@v1 + with: + version: "v0.7.0" buildkitd-flags: --debug - uses: docker/login-action@v1 with: From 84035341a8af89f48b9fa26b96b4e3e4f9d78b90 Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 26 Nov 2021 01:26:58 +0200 Subject: [PATCH 36/51] fix: force_install_dir error SteamCMD now complains when trying to login before providing install dir `Please use force_install_dir before logon!` --- wine/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wine/entrypoint.sh b/wine/entrypoint.sh index 6b0ae56..c98e308 100644 --- a/wine/entrypoint.sh +++ b/wine/entrypoint.sh @@ -24,7 +24,7 @@ fi if [ -z ${AUTO_UPDATE} ] || [ "${AUTO_UPDATE}" == "1" ]; then # Update Source Server if [ ! -z ${SRCDS_APPID} ]; then - ./steamcmd/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ "${WINDOWS_INSTALL}" == "1" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +force_install_dir /home/container +app_update ${SRCDS_APPID} $( [[ ! -z ${SRCDS_BETAID} ]] && printf %s "-beta ${SRCDS_BETAID}" ) $( [[ ! -z ${SRCDS_BETAPASS} ]] && printf %s "-betapassword ${SRCDS_BETAPASS}" ) $( [[ ! -z ${HLDS_GAME} ]] && printf %s "+app_set_config 90 mod ${HLDS_GAME}" ) $( [[ ! -z ${VALIDATE} ]] && printf %s "validate" ) +quit + ./steamcmd/steamcmd.sh +force_install_dir /home/container +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ "${WINDOWS_INSTALL}" == "1" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ ! -z ${SRCDS_BETAID} ]] && printf %s "-beta ${SRCDS_BETAID}" ) $( [[ ! -z ${SRCDS_BETAPASS} ]] && printf %s "-betapassword ${SRCDS_BETAPASS}" ) $( [[ ! -z ${HLDS_GAME} ]] && printf %s "+app_set_config 90 mod ${HLDS_GAME}" ) $( [[ ! -z ${VALIDATE} ]] && printf %s "validate" ) +quit else echo -e "No appid set. Starting Server" fi From 28ce052787665c50111ce8aa7419d2221c216519 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sat, 27 Nov 2021 07:51:31 +0100 Subject: [PATCH 37/51] feat: add rconcli to source image (#27) --- games/source/Dockerfile | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/games/source/Dockerfile b/games/source/Dockerfile index 8ce953a..617a9f6 100644 --- a/games/source/Dockerfile +++ b/games/source/Dockerfile @@ -30,10 +30,16 @@ LABEL org.opencontainers.image.licenses=MIT ENV DEBIAN_FRONTEND=noninteractive RUN dpkg --add-architecture i386 \ - && apt update \ - && apt upgrade -y \ - && apt install -y tar curl gcc g++ lib32gcc-s1 libgcc1 libcurl4-gnutls-dev:i386 libssl1.1:i386 libcurl4:i386 lib32tinfo6 libtinfo6:i386 lib32z1 lib32stdc++6 libncurses5:i386 libcurl3-gnutls:i386 libsdl2-2.0-0:i386 iproute2 gdb libsdl1.2debian libfontconfig1 telnet net-tools netcat tzdata \ - && useradd -m -d /home/container container + && apt update \ + && apt upgrade -y \ + && apt install -y tar curl gcc g++ lib32gcc-s1 libgcc1 libcurl4-gnutls-dev:i386 libssl1.1:i386 libcurl4:i386 lib32tinfo6 libtinfo6:i386 lib32z1 lib32stdc++6 libncurses5:i386 libcurl3-gnutls:i386 libsdl2-2.0-0:i386 iproute2 gdb libsdl1.2debian libfontconfig1 telnet net-tools netcat tzdata \ + && useradd -m -d /home/container container + +## install rcon +RUN cd /tmp/ \ + && curl -sSL https://github.com/gorcon/rcon-cli/releases/download/v0.10.1/rcon-0.10.1-amd64_linux.tar.gz > rcon.tar.gz \ + && tar xvf rcon.tar.gz \ + && mv rcon-0.10.1-amd64_linux/rcon /usr/local/bin/ USER container ENV USER=container HOME=/home/container From fe82cc0ac07be9923d9034b376d2b862c6e5a352 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 27 Nov 2021 08:54:41 +0200 Subject: [PATCH 38/51] chore: remove reduntant FiveM specific image --- .github/workflows/games.yml | 1 - README.md | 2 -- games/fivem/Dockerfile | 38 ------------------------------- games/fivem/entrypoint.sh | 45 ------------------------------------- 4 files changed, 86 deletions(-) delete mode 100644 games/fivem/Dockerfile delete mode 100644 games/fivem/entrypoint.sh diff --git a/.github/workflows/games.yml b/.github/workflows/games.yml index fbd105b..4ca3a3a 100644 --- a/.github/workflows/games.yml +++ b/.github/workflows/games.yml @@ -17,7 +17,6 @@ jobs: matrix: game: - arma3 - - fivem - source steps: - uses: actions/checkout@v2 diff --git a/README.md b/README.md index 89db575..eeb77c7 100644 --- a/README.md +++ b/README.md @@ -65,8 +65,6 @@ is tagged correctly. ### [Games](/games) * [`arma3`](/games/arma3) * `ghcr.io/parkervcp/games:arma3` - * [`fivem`](/games/fivem) - * `ghcr.io/parkervcp/games:fivem` * [`source`](/games/source) * `ghcr.io/parkervcp/games:source` ### [Golang](/go) diff --git a/games/fivem/Dockerfile b/games/fivem/Dockerfile deleted file mode 100644 index ece45de..0000000 --- a/games/fivem/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2021 Matthew Penner -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. -# - -FROM --platform=$BUILDPLATFORM alpine:latest - -LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" - -LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolks" -LABEL org.opencontainers.image.licenses=MIT - -RUN apk add --update --no-cache ca-certificates c-ares icu-libs libssl1.1 libunwind musl musl-dbg tzdata zlib \ - && adduser -D -h /home/container container - -USER container -ENV USER=container HOME=/home/container -WORKDIR /home/container - -COPY ./entrypoint.sh /entrypoint.sh -CMD [ "/bin/ash", "/entrypoint.sh" ] diff --git a/games/fivem/entrypoint.sh b/games/fivem/entrypoint.sh deleted file mode 100644 index 83f6218..0000000 --- a/games/fivem/entrypoint.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/ash - -# -# Copyright (c) 2021 Matthew Penner -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. -# - -# Default the TZ environment variable to UTC. -TZ=${TZ:-UTC} -export TZ - -# Set environment variable that holds the Internal Docker IP -INTERNAL_IP=$(ip route get 1 | awk '{print $NF;exit}') -export INTERNAL_IP - -# Switch to the container's working directory -cd /home/container || exit 1 - -# Convert all of the "{{VARIABLE}}" parts of the command into the expected shell -# variable format of "${VARIABLE}" before evaluating the string and automatically -# replacing the values. -PARSED=$(echo "${STARTUP}" | sed -e 's/{{/${/g' -e 's/}}/}/g' | eval echo "$(cat -)") - -# Display the command we're running in the output, and then execute it with the env -# from the container itself. -printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0m%s\n" "$PARSED" -# shellcheck disable=SC2086 -exec env ${PARSED} From 2e366792c15eba443cea2b7ea38abf396d9f9c31 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 7 Dec 2021 15:30:41 +0200 Subject: [PATCH 39/51] ci(source): change startup parsing to eval exec does not support startups that are more keen of scripts with multiple breaks and statements. Ark or 7d2d are examples of this. ref https://github.com/parkervcp/eggs/pull/1420 --- games/source/entrypoint.sh | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/games/source/entrypoint.sh b/games/source/entrypoint.sh index eabbe6e..3eccb7d 100644 --- a/games/source/entrypoint.sh +++ b/games/source/entrypoint.sh @@ -36,10 +36,6 @@ export INTERNAL_IP # Switch to the container's working directory cd /home/container || exit 1 -# Convert all of the "{{VARIABLE}}" parts of the command into the expected shell -# variable format of "${VARIABLE}" before evaluating the string and automatically -# replacing the values. -PARSED=$(echo "${STARTUP}" | sed -e 's/{{/${/g' -e 's/}}/}/g' | eval echo "$(cat -)") ## just in case someone removed the defaults. if [ "${STEAM_USER}" == "" ]; then @@ -65,8 +61,9 @@ else echo -e "Not updating game server as auto update was set to 0. Starting Server" fi -# Display the command we're running in the output, and then execute it with the env -# from the container itself. -printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0m%s\n" "$PARSED" -# shellcheck disable=SC2086 -exec env ${PARSED} +# Replace Startup Variables +MODIFIED_STARTUP=$(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g') +echo -e ":/home/container$ ${MODIFIED_STARTUP}" + +# Run the Server +eval ${MODIFIED_STARTUP} From e0e3b4bf7b9932da9bc6436cf33e24deeae0f4c0 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 7 Dec 2021 17:59:54 +0200 Subject: [PATCH 40/51] fix(source): windows parameter for auto update --- games/source/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games/source/entrypoint.sh b/games/source/entrypoint.sh index 3eccb7d..f2f2744 100644 --- a/games/source/entrypoint.sh +++ b/games/source/entrypoint.sh @@ -52,7 +52,7 @@ fi if [ -z ${AUTO_UPDATE} ] || [ "${AUTO_UPDATE}" == "1" ]; then # Update Source Server if [ ! -z ${SRCDS_APPID} ]; then - ./steamcmd/steamcmd.sh +force_install_dir /home/container +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s "-beta ${SRCDS_BETAID}" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s "-betapassword ${SRCDS_BETAPASS}" ) $( [[ -z ${HLDS_GAME} ]] || printf %s "+app_set_config 90 mod ${HLDS_GAME}" ) $( [[ -z ${VALIDATE} ]] || printf %s "validate" ) +quit + ./steamcmd/steamcmd.sh +force_install_dir /home/container +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ "${WINDOWS_INSTALL}" == "1" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s "-beta ${SRCDS_BETAID}" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s "-betapassword ${SRCDS_BETAPASS}" ) $( [[ -z ${HLDS_GAME} ]] || printf %s "+app_set_config 90 mod ${HLDS_GAME}" ) $( [[ -z ${VALIDATE} ]] || printf %s "validate" ) +quit else echo -e "No appid set. Starting Server" fi From 167df328f4a8d5c9ccb1ca4d8404f9871d502561 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Tue, 7 Dec 2021 21:35:49 -0500 Subject: [PATCH 41/51] 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 42/51] 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 43/51] 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 44/51] 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 45/51] 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 46/51] 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 47/51] 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 48/51] 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 49/51] 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 50/51] 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 }} From 6bde9c7d3e8641b9569a001745ed69f356075469 Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Tue, 14 Dec 2021 14:58:39 +0200 Subject: [PATCH 51/51] chore: remove reduntant node 15 non-LTS release closes #31 --- .github/workflows/nodejs.yml | 1 - README.md | 180 ++++++++++++++++++++--------------- nodejs/15/Dockerfile | 15 --- 3 files changed, 103 insertions(+), 93 deletions(-) delete mode 100644 nodejs/15/Dockerfile diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 09c9c33..179c8b5 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -18,7 +18,6 @@ jobs: tag: - 12 - 14 - - 15 - 16 - 17 steps: diff --git a/README.md b/README.md index eeb77c7..c2b666b 100644 --- a/README.md +++ b/README.md @@ -18,107 +18,133 @@ example of this would be something like Java or Python which are used for runnin All of these images are available for `linux/amd64` and `linux/arm64` versions, unless otherwise specified, to use these images on an arm system, no modification to them or the tag is needed, they should just work. -### Contributing +## Contributing When adding a new version to an existing image, such as `java v42`, you'd add it within a child folder of `java`, so `java/42/Dockerfile` for example. Please also update the correct `.github/workflows` file to ensure that this new version is tagged correctly. ## Available Images + ### [Oses](/oses) + * [alpine](/oses/alpine) * `ghcr.io/parkervcp/yolks:alpine` * [debian](/oses/debian) * `ghcr.io/parkervcp/yolks:debian` * [ubuntu](/oses/ubuntu) * `ghcr.io/parkervcp/yolks:ubuntu` -### [Bot](/bot) - * [`bastion`](/bot/bastion) - * `ghcr.io/parkervcp/yolks:bot_bastion` - * [`parkertron`](/bot/parkertron) - * `ghcr.io/parkervcp/yolks:bot_parkertron` - * [`redbot`](/bot/red) - * `ghcr.io/parkervcp/yolks:bot_red` - * [`sinusbot`](/bot/sinusbot) - * `ghcr.io/parkervcp/yolks:bot_sinusbot` + +### [Bot](/bot) + +* [`bastion`](/bot/bastion) + * `ghcr.io/parkervcp/yolks:bot_bastion` +* [`parkertron`](/bot/parkertron) + * `ghcr.io/parkervcp/yolks:bot_parkertron` +* [`redbot`](/bot/red) + * `ghcr.io/parkervcp/yolks:bot_red` +* [`sinusbot`](/bot/sinusbot) + * `ghcr.io/parkervcp/yolks:bot_sinusbot` + ### [Cassandra](/cassandra) - * [`cassandra_java8_python27`](/cassandra/cassandra_java8_python2) - * `ghcr.io/parkervcp/yolks:cassandra_java11_python2` - * [`cassandra_java11_python3`](/cassandra/cassandra_java11_python3) - * `ghcr.io/parkervcp/yolks:cassandra_java11_python3` + +* [`cassandra_java8_python27`](/cassandra/cassandra_java8_python2) + * `ghcr.io/parkervcp/yolks:cassandra_java11_python2` +* [`cassandra_java11_python3`](/cassandra/cassandra_java11_python3) + * `ghcr.io/parkervcp/yolks:cassandra_java11_python3` + ### [dotNet](/dotnet) - * [`dotnet2.1`](/dotnet/2.1) - * `ghcr.io/parkervcp/yolks:dotnet_2.1` - * [`dotnet3.1`](/dotnet/3.1) - * `ghcr.io/parkervcp/yolks:dotnet_3.1` - * [`dotnet5.0`](/dotnet/5) - * `ghcr.io/parkervcp/yolks:dotnet_5` - * [`dotnet6.0`](/dotnet/6) - * `ghcr.io/parkervcp/yolks:dotnet_6` + +* [`dotnet2.1`](/dotnet/2.1) + * `ghcr.io/parkervcp/yolks:dotnet_2.1` +* [`dotnet3.1`](/dotnet/3.1) + * `ghcr.io/parkervcp/yolks:dotnet_3.1` +* [`dotnet5.0`](/dotnet/5) + * `ghcr.io/parkervcp/yolks:dotnet_5` +* [`dotnet6.0`](/dotnet/6) + * `ghcr.io/parkervcp/yolks:dotnet_6` + ### [Erlang](/erlang) - * [`erlang22`](/erlang/22) - * `ghcr.io/parkervcp/yolks:erlang_22` - * [`erlang23`](/erlang/23) - * `ghcr.io/parkervcp/yolks:erlang_23` - * [`erlang24`](/erlang/24) - * `ghcr.io/parkervcp/yolks:erlang_24` -### [Games](/games) - * [`arma3`](/games/arma3) - * `ghcr.io/parkervcp/games:arma3` - * [`source`](/games/source) - * `ghcr.io/parkervcp/games:source` + +* [`erlang22`](/erlang/22) + * `ghcr.io/parkervcp/yolks:erlang_22` +* [`erlang23`](/erlang/23) + * `ghcr.io/parkervcp/yolks:erlang_23` +* [`erlang24`](/erlang/24) + * `ghcr.io/parkervcp/yolks:erlang_24` + +### [Games](/games) + +* [`arma3`](/games/arma3) + * `ghcr.io/parkervcp/games:arma3` +* [`source`](/games/source) + * `ghcr.io/parkervcp/games:source` + ### [Golang](/go) - * [`go1.14`](/go/1.14) - * `ghcr.io/parkervcp/yolks:go_1.14` - * [`go1.15`](/go/1.15) - * `ghcr.io/parkervcp/yolks:go_1.15` - * [`go1.16`](/go/1.16) - * `ghcr.io/parkervcp/yolks:go_1.16` + +* [`go1.14`](/go/1.14) + * `ghcr.io/parkervcp/yolks:go_1.14` +* [`go1.15`](/go/1.15) + * `ghcr.io/parkervcp/yolks:go_1.15` +* [`go1.16`](/go/1.16) + * `ghcr.io/parkervcp/yolks:go_1.16` + ### [Java](/java) - * [`java7`](/java/7) - * `ghcr.io/parkervcp/yolks:java_7` - * [`java8`](/java/8) - * `ghcr.io/parkervcp/yolks:java_8` - * [`java9`](/java/9) - * `ghcr.io/parkervcp/yolks:java_9` - * [`java11`](/java/11) - * `ghcr.io/parkervcp/yolks:java_11` - * [`java14`](/java/14) - * `ghcr.io/parkervcp/yolks:java_14` - * [`java16`](/java/16) - * `ghcr.io/parkervcp/yolks:java_16` - * [`java17`](/java/17) - * `ghcr.io/parkervcp/yolks:java_17` + +* [`java7`](/java/7) + * `ghcr.io/parkervcp/yolks:java_7` +* [`java8`](/java/8) + * `ghcr.io/parkervcp/yolks:java_8` +* [`java9`](/java/9) + * `ghcr.io/parkervcp/yolks:java_9` +* [`java11`](/java/11) + * `ghcr.io/parkervcp/yolks:java_11` +* [`java14`](/java/14) + * `ghcr.io/parkervcp/yolks:java_14` +* [`java16`](/java/16) + * `ghcr.io/parkervcp/yolks:java_16` +* [`java17`](/java/17) + * `ghcr.io/parkervcp/yolks:java_17` + ### [Mono](/mono) - * [`mono_latest`](/mono/latest) - * `ghcr.io/parkervcp/yolks:mono_latest` + +* [`mono_latest`](/mono/latest) + * `ghcr.io/parkervcp/yolks:mono_latest` + ### [Nodejs](/nodejs) - * [`node12`](/nodejs/12) - * `ghcr.io/parkervcp/yolks:nodejs_12` - * [`node14`](/nodejs/14) - * `ghcr.io/parkervcp/yolks:nodejs_14` - * [`node15`](/nodejs/15) - * `ghcr.io/parkervcp/yolks:nodejs_15` - * [`node16`](/nodejs/16) - * `ghcr.io/parkervcp/yolks:nodejs_16` - * [`node17`](/nodejs/17) - * `ghcr.io/parkervcp/yolks:nodejs_17` + +* [`node12`](/nodejs/12) + * `ghcr.io/parkervcp/yolks:nodejs_12` +* [`node14`](/nodejs/14) + * `ghcr.io/parkervcp/yolks:nodejs_14` +* [`node16`](/nodejs/16) + * `ghcr.io/parkervcp/yolks:nodejs_16` +* [`node17`](/nodejs/17) + * `ghcr.io/parkervcp/yolks:nodejs_17` + ### [Python](/python) - * [`python3.7`](/python/3.7) - * `ghcr.io/parkervcp/yolks:python_3.7` - * [`python3.8`](/python/3.8) - * `ghcr.io/parkervcp/yolks:python_3.8` - * [`python3.9`](/python/3.9) - * `ghcr.io/parkervcp/yolks:python_3.9` - * [`python3.10`](/python/3.10) - * `ghcr.io/parkervcp/yolks:python_3.10` + +* [`python3.7`](/python/3.7) + * `ghcr.io/parkervcp/yolks:python_3.7` +* [`python3.8`](/python/3.8) + * `ghcr.io/parkervcp/yolks:python_3.8` +* [`python3.9`](/python/3.9) + * `ghcr.io/parkervcp/yolks:python_3.9` +* [`python3.10`](/python/3.10) + * `ghcr.io/parkervcp/yolks:python_3.10` + ### [Voice](/voice) - * [`TeaSpeak`](/teaspeak) - * `ghcr.io/parkervcp/yolks:voice_teaspeak` + +* [`TeaSpeak`](/teaspeak) + * `ghcr.io/parkervcp/yolks:voice_teaspeak` + ### [Wine](/wine) - * [`Wine`](/wine) - * `ghcr.io/parkervcp/yolks:wine_latest` + +* [`Wine`](/wine) + * `ghcr.io/parkervcp/yolks:wine_latest` + ### [Installation Images](/installers) + * [`alpine-install`](/installers/alpine) * `ghcr.io/parkervcp/installers:alpine` * [`debian-install`](/installers/debian) diff --git a/nodejs/15/Dockerfile b/nodejs/15/Dockerfile deleted file mode 100644 index c867605..0000000 --- a/nodejs/15/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -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 libtool \ - && npm -g install npm@latest \ - && useradd -m -d /home/container container - -USER container -ENV USER=container HOME=/home/container -WORKDIR /home/container - -COPY ./../entrypoint.sh /entrypoint.sh -CMD [ "/bin/bash", "/entrypoint.sh" ]