From dee50167cd32bbbb5be6f8d7638931081c9a1dd0 Mon Sep 17 00:00:00 2001 From: darksaid98 Date: Sat, 2 Dec 2023 09:17:23 +0100 Subject: [PATCH] Squashed commit of the following: commit b3f1e19813182deee2024dc8d79e33dd6e6daad3 Merge: 72650fe 7e2ffbb Author: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Thu Nov 30 23:53:50 2023 +0100 Merge pull request #209 from MarcoCoreDuo/java-21-tini Add tini to java 21 Dockerfile commit 7e2ffbbfd8349408007a18340a02d6d34777a3c5 Author: MarcoCoreDuo <90222533+MarcoCoreDuo@users.noreply.github.com> Date: Thu Nov 30 22:37:59 2023 +0100 Add tini to java 21 Dockerfile commit 72650fe46f1ac2488caf61084f4e874e1520aa7c Merge: fa14c76 5023aa8 Author: Michael (Parker) Parker Date: Sun Nov 19 12:37:05 2023 -0500 Merge pull request #204 from parkervcp/tini-2 Add tini to some more images + fix Postgress stop commit fa14c76d0e7c1a6b5326faea6d89f05d85154f56 Merge: f751694 dc52a6b Author: Michael (Parker) Parker Date: Sun Nov 19 12:36:17 2023 -0500 Merge pull request #203 from parkervcp/fixes Fixes images build + update workflow actions commit f75169423993291cc76da8c466c743498bfd6448 Merge: fa5c4c1 f841911 Author: Michael (Parker) Parker Date: Sat Nov 18 20:37:29 2023 -0500 Merge pull request #206 from Senaris/master Add dotnet_8 commit f84191102af23652eec86344b662f1a33bd74a14 Author: Tita Junior Radu Date: Sun Nov 19 03:08:44 2023 +0200 Add dotnet_8 commit dc52a6b037d6654952301b8cbc73b17043d3e25d Author: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Sat Nov 18 18:52:06 2023 +0100 Update all workflow actions commit fa5c4c1be5c83e73415e47c13a7e2a3431aced6c Merge: 3dc42eb 89d6a83 Author: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Sat Nov 18 18:45:16 2023 +0100 Merge pull request #205 from Senaris/master Add dotnet 8 commit 5023aa8715af4b0f01bea86298519271ee0ac3c4 Author: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Sat Nov 18 18:42:27 2023 +0100 install tini commit a02fea5fd620eb6b0669fb9cfe471336025fadf0 Author: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Sat Nov 18 14:18:35 2023 +0100 add tini to dayz commit 71f1752fda1e9722fd00047ab2c19176eaa59d58 Author: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Sat Nov 18 14:16:12 2023 +0100 Add tini and more packages to postgres commit 89d6a8311e0ac75bb78072c7cd8aab3957ffdcb0 Author: Senaris Date: Fri Nov 17 02:12:48 2023 +0200 dotnet 8 commit 535e9f9c3edf2ab212c375a7137cfe7e0fbc9d08 Author: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Sat Nov 11 10:38:14 2023 +0100 add tini: Valheim commit ddce84116a0af836cd47109470e420764cb5a390 Author: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Sat Nov 11 10:34:10 2023 +0100 add tini: elixir commit 816a447e3a4cfd342c9a4a499b1a876424d0a41a Author: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Sat Nov 11 10:32:24 2023 +0100 add forgoten STOPSIGNAL to uptimekuma commit 3ef00bd2161b3e30f3729e05254c677ee8b9807e Author: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Sat Nov 11 10:31:42 2023 +0100 add tini to bun commit 83436eb3b690d6929146f500127c74c191c43908 Author: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Sat Nov 11 10:29:52 2023 +0100 add tini: Uptimekuma commit e638f58017c73a8052e7f0719d9adce853631492 Author: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Wed Nov 1 20:17:41 2023 +0100 Rust: stop building 1.31 commit f226560025e657d2f90a62195750147df9160228 Author: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Wed Nov 1 20:15:57 2023 +0100 redbot: do not install discord-text-sanitizer commit c523dc525876662aee00912d27eaf7940cf7b167 Author: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Wed Nov 1 20:15:32 2023 +0100 Update bastion --- .github/workflows/apps.yml | 2 +- .github/workflows/base.yml | 10 +++++----- .github/workflows/box64.yml | 10 +++++----- .github/workflows/bun.yml | 10 +++++----- .github/workflows/cassandra.yml | 8 ++++---- .github/workflows/dart.yml | 8 ++++---- .github/workflows/dotnet.yml | 11 ++++++----- .github/workflows/elixir.yml | 10 +++++----- .github/workflows/erlang.yml | 8 ++++---- .github/workflows/games.yml | 18 ++++++++--------- .github/workflows/go.yml | 8 ++++---- .github/workflows/installers.yml | 10 +++++----- .github/workflows/java.yml | 10 +++++----- .github/workflows/mariadb.yml | 10 +++++----- .github/workflows/mongodb.yml | 10 +++++----- .github/workflows/mono.yml | 8 ++++---- .github/workflows/nodejs.yml | 10 +++++----- .github/workflows/postgres.yml | 10 +++++----- .github/workflows/python.yml | 10 +++++----- .github/workflows/redis.yml | 10 +++++----- .github/workflows/rust.yml | 10 +++++----- .github/workflows/steamcmd.yml | 8 ++++---- .github/workflows/voice.yml | 16 ++++++++-------- .github/workflows/wine.yml | 8 ++++---- README.md | 2 ++ bun/canary/Dockerfile | 2 +- bun/latest/Dockerfile | 2 +- dotnet/8/Dockerfile | 25 ++++++++++++++++++++++++ elixir/1.12/Dockerfile | 2 +- elixir/1.13/Dockerfile | 2 +- elixir/1.14/Dockerfile | 2 +- elixir/1.15/Dockerfile | 2 +- elixir/latest/Dockerfile | 2 +- games/dayz/Dockerfile | 12 ++++++++---- games/valheim/Dockerfile | 6 ++++++ java/21/Dockerfile | 33 ++++++++++++++++++-------------- postgres/10/Dockerfile | 10 ++++++++-- postgres/11/Dockerfile | 10 ++++++++-- postgres/12/Dockerfile | 10 ++++++++-- postgres/13/Dockerfile | 10 ++++++++-- postgres/14/Dockerfile | 10 ++++++++-- postgres/9/Dockerfile | 9 +++++++-- 42 files changed, 231 insertions(+), 153 deletions(-) create mode 100644 dotnet/8/Dockerfile diff --git a/.github/workflows/apps.yml b/.github/workflows/apps.yml index 490e4acfd..919ca5837 100644 --- a/.github/workflows/apps.yml +++ b/.github/workflows/apps.yml @@ -18,7 +18,7 @@ jobs: app: - uptimekuma steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: docker/setup-qemu-action@v3 diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml index 3e55c1c1c..d0345e3bd 100644 --- a/.github/workflows/base.yml +++ b/.github/workflows/base.yml @@ -20,17 +20,17 @@ jobs: - debian - ubuntu steps: - - uses: actions/checkout@v3 - - uses: docker/setup-qemu-action@v2 - - uses: docker/setup-buildx-action@v2 + - uses: actions/checkout@v4 + - uses: docker/setup-qemu-action@v3 + - uses: docker/setup-buildx-action@v3 with: buildkitd-flags: --debug - - uses: docker/login-action@v2 + - uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - uses: docker/build-push-action@v4 + - uses: docker/build-push-action@v5 with: context: ./oses/${{ matrix.oses }} file: ./oses/${{ matrix.oses }}/Dockerfile diff --git a/.github/workflows/box64.yml b/.github/workflows/box64.yml index de82ab1eb..05ba7641f 100644 --- a/.github/workflows/box64.yml +++ b/.github/workflows/box64.yml @@ -18,17 +18,17 @@ jobs: tag: - box64 steps: - - uses: actions/checkout@v3 - - uses: docker/setup-qemu-action@v2 - - uses: docker/setup-buildx-action@v2 + - uses: actions/checkout@v4 + - uses: docker/setup-qemu-action@v3 + - uses: docker/setup-buildx-action@v3 with: buildkitd-flags: --debug - - uses: docker/login-action@v2 + - uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - uses: docker/build-push-action@v4 + - uses: docker/build-push-action@v5 with: context: ./box64 file: ./${{ matrix.tag }}/Dockerfile diff --git a/.github/workflows/bun.yml b/.github/workflows/bun.yml index bda63ff31..18f9fef5c 100644 --- a/.github/workflows/bun.yml +++ b/.github/workflows/bun.yml @@ -19,17 +19,17 @@ jobs: - latest - canary steps: - - uses: actions/checkout@v3 - - uses: docker/setup-qemu-action@v2 - - uses: docker/setup-buildx-action@v2 + - uses: actions/checkout@v4 + - uses: docker/setup-qemu-action@v3 + - uses: docker/setup-buildx-action@v3 with: buildkitd-flags: --debug - - uses: docker/login-action@v2 + - uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - uses: docker/build-push-action@v4 + - uses: docker/build-push-action@v5 with: context: ./bun file: ./bun/${{ matrix.tag }}/Dockerfile diff --git a/.github/workflows/cassandra.yml b/.github/workflows/cassandra.yml index 59e085a48..b14a3017d 100644 --- a/.github/workflows/cassandra.yml +++ b/.github/workflows/cassandra.yml @@ -19,16 +19,16 @@ jobs: - java8_python2 - java11_python3 steps: - - uses: actions/checkout@v3 - - uses: docker/setup-buildx-action@v2 + - uses: actions/checkout@v4 + - uses: docker/setup-buildx-action@v3 with: buildkitd-flags: --debug - - uses: docker/login-action@v2 + - uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - uses: docker/build-push-action@v4 + - uses: docker/build-push-action@v5 with: context: ./cassandra file: ./cassandra/${{ matrix.tag }}/Dockerfile diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index b0caa40d5..0780a2714 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -22,16 +22,16 @@ jobs: steps: - uses: actions/checkout@v3 # Setup QEMU for ARM64 Build - - uses: docker/setup-qemu-action@v2 - - uses: docker/setup-buildx-action@v2 + - uses: docker/setup-qemu-action@v3 + - uses: docker/setup-buildx-action@v3 with: buildkitd-flags: --debug - - uses: docker/login-action@v2 + - uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - uses: docker/build-push-action@v4 + - uses: docker/build-push-action@v5 with: context: ./dart file: ./dart/${{ matrix.tag }}/Dockerfile diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index e010180ed..ee11181b8 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -21,19 +21,20 @@ jobs: - 5 - 6 - 7 + - 8 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 # Setup QEMU for ARM64 Build - - uses: docker/setup-qemu-action@v1 - - uses: docker/setup-buildx-action@v2 + - uses: docker/setup-qemu-action@v3 + - uses: docker/setup-buildx-action@v3 with: buildkitd-flags: --debug - - uses: docker/login-action@v2 + - uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - uses: docker/build-push-action@v4 + - uses: docker/build-push-action@v5 with: context: ./dotnet file: ./dotnet/${{ matrix.tag }}/Dockerfile diff --git a/.github/workflows/elixir.yml b/.github/workflows/elixir.yml index 12bc2625c..1bcf97ac9 100644 --- a/.github/workflows/elixir.yml +++ b/.github/workflows/elixir.yml @@ -22,17 +22,17 @@ jobs: - '1.12' - latest steps: - - uses: actions/checkout@v3 - - uses: docker/setup-qemu-action@v2 - - uses: docker/setup-buildx-action@v2 + - uses: actions/checkout@v4 + - uses: docker/setup-qemu-action@v3 + - uses: docker/setup-buildx-action@v3 with: buildkitd-flags: --debug - - uses: docker/login-action@v2 + - uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - uses: docker/build-push-action@v4 + - uses: docker/build-push-action@v5 with: context: ./elixir file: ./elixir/${{ matrix.tag }}/Dockerfile diff --git a/.github/workflows/erlang.yml b/.github/workflows/erlang.yml index 6bfac5f39..6de3c2090 100644 --- a/.github/workflows/erlang.yml +++ b/.github/workflows/erlang.yml @@ -22,16 +22,16 @@ jobs: - 25 - 26 steps: - - uses: actions/checkout@v3 - - uses: docker/setup-buildx-action@v2 + - uses: actions/checkout@v4 + - uses: docker/setup-buildx-action@v3 with: buildkitd-flags: --debug - - uses: docker/login-action@v2 + - uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - uses: docker/build-push-action@v4 + - uses: docker/build-push-action@v5 with: context: ./erlang file: ./erlang/${{ matrix.tag }}/Dockerfile diff --git a/.github/workflows/games.yml b/.github/workflows/games.yml index 04310222e..d48d81f61 100644 --- a/.github/workflows/games.yml +++ b/.github/workflows/games.yml @@ -25,16 +25,16 @@ jobs: - source steps: - - uses: actions/checkout@v3 - - uses: docker/setup-buildx-action@v2 + - uses: actions/checkout@v4 + - uses: docker/setup-buildx-action@v3 with: buildkitd-flags: --debug - - uses: docker/login-action@v2 + - uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - uses: docker/build-push-action@v4 + - uses: docker/build-push-action@v5 with: context: ./games/${{ matrix.game }} file: ./games/${{ matrix.game }}/Dockerfile @@ -53,20 +53,20 @@ jobs: - mta - valheim steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 with: platforms: arm64,amd64 - - uses: docker/setup-buildx-action@v2 + - uses: docker/setup-buildx-action@v3 with: buildkitd-flags: --debug - - uses: docker/login-action@v2 + - uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - uses: docker/build-push-action@v4 + - uses: docker/build-push-action@v5 with: context: ./games/${{ matrix.game }} file: ./games/${{ matrix.game }}/Dockerfile diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index a11dea75c..479c9d6ea 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -25,16 +25,16 @@ jobs: - '1.20' - '1.21' steps: - - uses: actions/checkout@v3 - - uses: docker/setup-buildx-action@v2 + - uses: actions/checkout@v4 + - uses: docker/setup-buildx-action@v3 with: buildkitd-flags: --debug - - uses: docker/login-action@v2 + - uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - uses: docker/build-push-action@v4 + - uses: docker/build-push-action@v5 with: context: ./go file: ./go/${{ matrix.tag }}/Dockerfile diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index d072e0d3d..b8d1ce944 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -20,17 +20,17 @@ jobs: - debian - ubuntu steps: - - uses: actions/checkout@v3 - - uses: docker/setup-qemu-action@v2 - - uses: docker/setup-buildx-action@v2 + - uses: actions/checkout@v4 + - uses: docker/setup-qemu-action@v3 + - uses: docker/setup-buildx-action@v3 with: buildkitd-flags: --debug - - uses: docker/login-action@v2 + - uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - uses: docker/build-push-action@v4 + - uses: docker/build-push-action@v5 with: context: ./installers file: ./installers/${{ matrix.tag }}/Dockerfile diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index 55f3d0390..469cc6871 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -26,17 +26,17 @@ jobs: - 19 - 21 steps: - - uses: actions/checkout@v3 - - uses: docker/setup-qemu-action@v2 - - uses: docker/setup-buildx-action@v2 + - uses: actions/checkout@v4 + - uses: docker/setup-qemu-action@v3 + - uses: docker/setup-buildx-action@v3 with: buildkitd-flags: --debug - - uses: docker/login-action@v2 + - uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - uses: docker/build-push-action@v4 + - uses: docker/build-push-action@v5 with: context: ./java file: ./java/${{ matrix.tag }}/Dockerfile diff --git a/.github/workflows/mariadb.yml b/.github/workflows/mariadb.yml index 925300e8d..f197bcb1b 100644 --- a/.github/workflows/mariadb.yml +++ b/.github/workflows/mariadb.yml @@ -23,17 +23,17 @@ jobs: - '10.6' - '10.7' steps: - - uses: actions/checkout@v3 - - uses: docker/setup-qemu-action@v2 - - uses: docker/setup-buildx-action@v2 + - uses: actions/checkout@v4 + - uses: docker/setup-qemu-action@v3 + - uses: docker/setup-buildx-action@v3 with: buildkitd-flags: --debug - - uses: docker/login-action@v2 + - uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - uses: docker/build-push-action@v4 + - uses: docker/build-push-action@v5 with: context: ./mariadb file: ./mariadb/${{ matrix.tag }}/Dockerfile diff --git a/.github/workflows/mongodb.yml b/.github/workflows/mongodb.yml index 7f25486bb..54946faaa 100644 --- a/.github/workflows/mongodb.yml +++ b/.github/workflows/mongodb.yml @@ -21,17 +21,17 @@ jobs: - 5 - 6 steps: - - uses: actions/checkout@v3 - - uses: docker/setup-qemu-action@v2 - - uses: docker/setup-buildx-action@v2 + - uses: actions/checkout@v4 + - uses: docker/setup-qemu-action@v3 + - uses: docker/setup-buildx-action@v3 with: buildkitd-flags: --debug - - uses: docker/login-action@v2 + - uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - uses: docker/build-push-action@v4 + - uses: docker/build-push-action@v5 with: context: ./mongodb file: ./mongodb/${{ matrix.tag }}/Dockerfile diff --git a/.github/workflows/mono.yml b/.github/workflows/mono.yml index 39a946d57..d90758d7e 100644 --- a/.github/workflows/mono.yml +++ b/.github/workflows/mono.yml @@ -18,16 +18,16 @@ jobs: tag: - latest steps: - - uses: actions/checkout@v3 - - uses: docker/setup-buildx-action@v2 + - uses: actions/checkout@v4 + - uses: docker/setup-buildx-action@v3 with: buildkitd-flags: --debug - - uses: docker/login-action@v2 + - uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - uses: docker/build-push-action@v4 + - uses: docker/build-push-action@v5 with: context: ./mono file: ./mono/${{ matrix.tag }}/Dockerfile diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 9e5437425..ebb949f13 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -24,18 +24,18 @@ jobs: - 19 - 20 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 # Setup QEMU for ARM64 Build - - uses: docker/setup-qemu-action@v2 - - uses: docker/setup-buildx-action@v2 + - uses: docker/setup-qemu-action@v3 + - uses: docker/setup-buildx-action@v3 with: buildkitd-flags: --debug - - uses: docker/login-action@v2 + - uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - uses: docker/build-push-action@v4 + - uses: docker/build-push-action@v5 with: context: ./nodejs file: ./nodejs/${{ matrix.tag }}/Dockerfile diff --git a/.github/workflows/postgres.yml b/.github/workflows/postgres.yml index 70ca17f4f..98d0d516b 100644 --- a/.github/workflows/postgres.yml +++ b/.github/workflows/postgres.yml @@ -24,17 +24,17 @@ jobs: - 13 - 14 steps: - - uses: actions/checkout@v3 - - uses: docker/setup-qemu-action@v2 - - uses: docker/setup-buildx-action@v2 + - uses: actions/checkout@v4 + - uses: docker/setup-qemu-action@v3 + - uses: docker/setup-buildx-action@v3 with: buildkitd-flags: --debug - - uses: docker/login-action@v2 + - uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - uses: docker/build-push-action@v4 + - uses: docker/build-push-action@v5 with: context: ./postgres file: ./postgres/${{ matrix.tag }}/Dockerfile diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 3a734ebcc..ee962a6a1 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -24,18 +24,18 @@ jobs: - '3.11' - '3.12' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 # Setup QEMU for ARM64 Build - - uses: docker/setup-qemu-action@v2 - - uses: docker/setup-buildx-action@v2 + - uses: docker/setup-qemu-action@v3 + - uses: docker/setup-buildx-action@v3 with: buildkitd-flags: --debug - - uses: docker/login-action@v2 + - uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - uses: docker/build-push-action@v4 + - uses: docker/build-push-action@v5 with: context: ./python file: ./python/${{ matrix.tag }}/Dockerfile diff --git a/.github/workflows/redis.yml b/.github/workflows/redis.yml index 877d4ee8a..d8f04b55a 100644 --- a/.github/workflows/redis.yml +++ b/.github/workflows/redis.yml @@ -21,17 +21,17 @@ jobs: - 6 - 7 steps: - - uses: actions/checkout@v3 - - uses: docker/setup-qemu-action@v2 - - uses: docker/setup-buildx-action@v2 + - uses: actions/checkout@v4 + - uses: docker/setup-qemu-action@v3 + - uses: docker/setup-buildx-action@v3 with: buildkitd-flags: --debug - - uses: docker/login-action@v2 + - uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - uses: docker/build-push-action@v4 + - uses: docker/build-push-action@v5 with: context: ./redis file: ./redis/${{ matrix.tag }}/Dockerfile diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index efb35783a..01452ba26 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -20,18 +20,18 @@ jobs: - '1.60' - 'latest' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 # Setup QEMU for ARM64 Build - - uses: docker/setup-qemu-action@v2 - - uses: docker/setup-buildx-action@v2 + - uses: docker/setup-qemu-action@v3 + - uses: docker/setup-buildx-action@v3 with: buildkitd-flags: --debug - - uses: docker/login-action@v2 + - uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - uses: docker/build-push-action@v4 + - uses: docker/build-push-action@v5 with: context: ./rust file: ./rust/${{ matrix.tag }}/Dockerfile diff --git a/.github/workflows/steamcmd.yml b/.github/workflows/steamcmd.yml index 3b943bcc8..1183d66cb 100644 --- a/.github/workflows/steamcmd.yml +++ b/.github/workflows/steamcmd.yml @@ -21,16 +21,16 @@ jobs: - dotnet - proton steps: - - uses: actions/checkout@v3 - - uses: docker/setup-buildx-action@v2 + - uses: actions/checkout@v4 + - uses: docker/setup-buildx-action@v3 with: buildkitd-flags: --debug - - uses: docker/login-action@v2 + - uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - uses: docker/build-push-action@v4 + - uses: docker/build-push-action@v5 with: context: ./steamcmd file: ./steamcmd/${{ matrix.distro }}/Dockerfile diff --git a/.github/workflows/voice.yml b/.github/workflows/voice.yml index 9911197f8..037c32657 100644 --- a/.github/workflows/voice.yml +++ b/.github/workflows/voice.yml @@ -18,16 +18,16 @@ jobs: tag: - teaspeak steps: - - uses: actions/checkout@v3 - - uses: docker/setup-buildx-action@v2 + - uses: actions/checkout@v4 + - uses: docker/setup-buildx-action@v3 with: buildkitd-flags: --debug - - uses: docker/login-action@v2 + - uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - uses: docker/build-push-action@v4 + - uses: docker/build-push-action@v5 with: context: ./voice/${{ matrix.tag }} file: ./voice/${{ matrix.tag }}/Dockerfile @@ -45,14 +45,14 @@ jobs: tag: - mumble steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 # Setup QEMU for ARM64 Build - - uses: docker/setup-qemu-action@v1 - - uses: docker/setup-buildx-action@v2 + - uses: docker/setup-qemu-action@v3 + - uses: docker/setup-buildx-action@v3 with: version: "v0.8.2" buildkitd-flags: --debug - - uses: docker/login-action@v2 + - uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} diff --git a/.github/workflows/wine.yml b/.github/workflows/wine.yml index 72a7719e8..09627da51 100644 --- a/.github/workflows/wine.yml +++ b/.github/workflows/wine.yml @@ -20,16 +20,16 @@ jobs: - devel - staging steps: - - uses: actions/checkout@v3 - - uses: docker/setup-buildx-action@v2 + - uses: actions/checkout@v4 + - uses: docker/setup-buildx-action@v3 with: buildkitd-flags: --debug - - uses: docker/login-action@v2 + - uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - uses: docker/build-push-action@v4 + - uses: docker/build-push-action@v5 with: context: ./wine file: ./wine/${{ matrix.tag }}/Dockerfile diff --git a/README.md b/README.md index 28ae410a4..866e28fc9 100644 --- a/README.md +++ b/README.md @@ -87,6 +87,8 @@ is tagged correctly. * `ghcr.io/darksaid98/yolks:dotnet_6` * [`dotnet7.0`](/dotnet/7) * `ghcr.io/darksaid98/yolks:dotnet_7` +* [`dotnet8.0`](/dotnet/8) + * `ghcr.io/darksaid98/yolks:dotnet_8` ### [Elixir](/elixir) diff --git a/bun/canary/Dockerfile b/bun/canary/Dockerfile index b7e65ff6a..5bf88d15e 100644 --- a/bun/canary/Dockerfile +++ b/bun/canary/Dockerfile @@ -3,7 +3,7 @@ FROM --platform=$TARGETOS/$TARGETARCH oven/bun:canary LABEL author="MrAtox" maintainer="mratox@protonmail.com" 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 \ + && apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential libtool tini \ && useradd -m -d /home/container container RUN bun upgrade diff --git a/bun/latest/Dockerfile b/bun/latest/Dockerfile index c5f701053..4338e0323 100644 --- a/bun/latest/Dockerfile +++ b/bun/latest/Dockerfile @@ -3,7 +3,7 @@ FROM --platform=$TARGETOS/$TARGETARCH oven/bun:latest LABEL author="MrAtox" maintainer="mratox@protonmail.com" 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 \ + && apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential libtool tini \ && useradd -m -d /home/container container RUN bun upgrade diff --git a/dotnet/8/Dockerfile b/dotnet/8/Dockerfile new file mode 100644 index 000000000..b158d0310 --- /dev/null +++ b/dotnet/8/Dockerfile @@ -0,0 +1,25 @@ +FROM --platform=$TARGETOS/$TARGETARCH 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 curl iproute2 libgdiplus tini \ + && wget https://dot.net/v1/dotnet-install.sh \ + && D_V="$(curl -sSL https://dotnet.microsoft.com/en-us/download/dotnet/8.0 | grep -i '

SDK 8.*.*

' | head -1 | awk -F\" '{print $3}' | awk '{print $2;}' | sed 's/<\/h3>//g')" \ + && chmod +x dotnet-install.sh \ + && ./dotnet-install.sh -i /usr/share -v $D_V \ + && ln -s /usr/share/dotnet /usr/bin/dotnet + +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container + +STOPSIGNAL SIGINT + +COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh +ENTRYPOINT ["/usr/bin/tini", "-g", "--"] +CMD ["/entrypoint.sh"] diff --git a/elixir/1.12/Dockerfile b/elixir/1.12/Dockerfile index 2e7f0d9c8..7c9ff703a 100644 --- a/elixir/1.12/Dockerfile +++ b/elixir/1.12/Dockerfile @@ -3,7 +3,7 @@ FROM --platform=$TARGETOS/$TARGETARCH elixir:1.12.3-slim LABEL author="MrAvox" maintainer="mravox@proton.me" RUN apt update \ - && apt -y install git dnsutils curl iproute2 ffmpeg \ + && apt -y install git dnsutils curl iproute2 ffmpeg tini \ && useradd -m -d /home/container container USER container diff --git a/elixir/1.13/Dockerfile b/elixir/1.13/Dockerfile index b7d78ed5e..8298b48d7 100644 --- a/elixir/1.13/Dockerfile +++ b/elixir/1.13/Dockerfile @@ -3,7 +3,7 @@ FROM --platform=$TARGETOS/$TARGETARCH elixir:1.13.4-slim LABEL author="MrAvox" maintainer="mravox@proton.me" RUN apt update \ - && apt -y install git dnsutils curl iproute2 ffmpeg \ + && apt -y install git dnsutils curl iproute2 ffmpeg tini \ && useradd -m -d /home/container container USER container diff --git a/elixir/1.14/Dockerfile b/elixir/1.14/Dockerfile index eacdc1cc9..5aec208df 100644 --- a/elixir/1.14/Dockerfile +++ b/elixir/1.14/Dockerfile @@ -3,7 +3,7 @@ FROM --platform=$TARGETOS/$TARGETARCH elixir:1.14.5-slim LABEL author="MrAvox" maintainer="mravox@proton.me" RUN apt update \ - && apt -y install git dnsutils curl iproute2 ffmpeg \ + && apt -y install git dnsutils curl iproute2 ffmpeg tini \ && useradd -m -d /home/container container USER container diff --git a/elixir/1.15/Dockerfile b/elixir/1.15/Dockerfile index 2903b15d8..71c441e4b 100644 --- a/elixir/1.15/Dockerfile +++ b/elixir/1.15/Dockerfile @@ -3,7 +3,7 @@ FROM --platform=$TARGETOS/$TARGETARCH elixir:1.15.4-slim LABEL author="MrAvox" maintainer="mravox@proton.me" RUN apt update \ - && apt -y install git dnsutils curl iproute2 ffmpeg \ + && apt -y install git dnsutils curl iproute2 ffmpeg tini \ && useradd -m -d /home/container container USER container diff --git a/elixir/latest/Dockerfile b/elixir/latest/Dockerfile index ec60892a3..2d2d5b0ac 100644 --- a/elixir/latest/Dockerfile +++ b/elixir/latest/Dockerfile @@ -3,7 +3,7 @@ FROM --platform=$TARGETOS/$TARGETARCH elixir:slim LABEL author="MrAvox" maintainer="mravox@proton.me" RUN apt update \ - && apt -y install git dnsutils curl iproute2 ffmpeg \ + && apt -y install git dnsutils curl iproute2 ffmpeg tini \ && useradd -m -d /home/container container USER container diff --git a/games/dayz/Dockerfile b/games/dayz/Dockerfile index 2b1195593..c8d24fec4 100644 --- a/games/dayz/Dockerfile +++ b/games/dayz/Dockerfile @@ -26,7 +26,8 @@ RUN dpkg --add-architecture i386 \ libstdc++6:i386 \ lib32stdc++6 \ libcap2 \ - libnss-wrapper + libnss-wrapper \ + tini ## Configure locale RUN update-locale lang=en_US.UTF-8 \ @@ -45,6 +46,9 @@ USER container ENV USER=container HOME=/home/container WORKDIR /home/container -## Copy over and execute entrypoint.sh -COPY ./entrypoint.sh /entrypoint.sh -CMD [ "/bin/bash", "/entrypoint.sh" ] +STOPSIGNAL SIGINT + +COPY --chown=container:container ./entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh +ENTRYPOINT ["/usr/bin/tini", "-g", "--"] +CMD ["/entrypoint.sh"] diff --git a/games/valheim/Dockerfile b/games/valheim/Dockerfile index 12b184d38..a552a4bc2 100644 --- a/games/valheim/Dockerfile +++ b/games/valheim/Dockerfile @@ -20,6 +20,12 @@ RUN dpkg --add-architecture armhf \ && apt update -y \ && apt upgrade -y \ && apt install -y build-essential cmake gcc-arm-linux-gnueabihf git libc6:armhf libncurses5:armhf libstdc++6:armhf libpulse0 locales git wget curl tar zip unzip binutils xz-utils gnupg2 iproute2 gettext libnss-wrapper +# RUN dpkg --add-architecture i386 \ +# && apt update \ +# && apt upgrade -y \ +# && apt install -y libcurl4-gnutls-dev:i386 libssl3:i386 libcurl4:i386 lib32tinfo6 libtinfo6:i386 lib32z1 lib32stdc++6 libncurses5:i386 libcurl3-gnutls:i386 libsdl2-2.0-0:i386 \ +# gcc g++ libgcc1 libc++-dev gdb libc6 curl tar iproute2 net-tools libatomic1 libsdl1.2debian libsdl2-2.0-0 \ +# libfontconfig locales libcurl3-gnutls libpulse-dev libpulse0 libnss-wrapper gettext tini ## configure locale RUN update-locale lang=en_US.UTF-8 \ diff --git a/java/21/Dockerfile b/java/21/Dockerfile index a372bffb0..b69070358 100644 --- a/java/21/Dockerfile +++ b/java/21/Dockerfile @@ -6,18 +6,19 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk LABEL org.opencontainers.image.licenses=MIT RUN apt update -y \ - && apt install -y \ - curl \ - lsof \ - ca-certificates \ - openssl \ - git \ - tar \ - sqlite3 \ - fontconfig \ - tzdata \ - iproute2 \ - libfreetype6 + && apt install -y \ + curl \ + lsof \ + ca-certificates \ + openssl \ + git \ + tar \ + sqlite3 \ + fontconfig \ + tzdata \ + iproute2 \ + libfreetype6 \ + tini ## Setup user and working directory RUN useradd -m -d /home/container -s /bin/bash container @@ -25,5 +26,9 @@ USER container ENV USER=container HOME=/home/container WORKDIR /home/container -COPY ./../entrypoint.sh /entrypoint.sh -CMD [ "/bin/bash", "/entrypoint.sh" ] +STOPSIGNAL SIGINT + +COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh +ENTRYPOINT ["/usr/bin/tini", "-g", "--"] +CMD ["/entrypoint.sh"] diff --git a/postgres/10/Dockerfile b/postgres/10/Dockerfile index 1a2c09d71..075d12e3b 100644 --- a/postgres/10/Dockerfile +++ b/postgres/10/Dockerfile @@ -8,9 +8,15 @@ LABEL author="Parker" maintainer="parker@pterodactyl.io" # UID 999 is the default pterodactyl user RUN adduser -D -h /home/container container +RUN apk add --no-cache tini curl iproute2 ca-certificates fontconfig git openssl sqlite tar tzdata + USER container ENV HOME /home/container WORKDIR /home/container -COPY ../entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] +STOPSIGNAL SIGINT + +COPY --chown=container:container ../entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh +ENTRYPOINT ["/sbin/tini", "-g", "--"] +CMD ["/entrypoint.sh"] diff --git a/postgres/11/Dockerfile b/postgres/11/Dockerfile index 4ed6f3838..992062e72 100644 --- a/postgres/11/Dockerfile +++ b/postgres/11/Dockerfile @@ -8,9 +8,15 @@ LABEL author="Parker" maintainer="parker@pterodactyl.io" # UID 999 is the default pterodactyl user RUN adduser -D -h /home/container container +RUN apk add --no-cache tini curl iproute2 ca-certificates fontconfig git openssl sqlite tar tzdata + USER container ENV HOME /home/container WORKDIR /home/container -COPY ../entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] +STOPSIGNAL SIGINT + +COPY --chown=container:container ../entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh +ENTRYPOINT ["/sbin/tini", "-g", "--"] +CMD ["/entrypoint.sh"] diff --git a/postgres/12/Dockerfile b/postgres/12/Dockerfile index e21d236b0..6dc5db190 100644 --- a/postgres/12/Dockerfile +++ b/postgres/12/Dockerfile @@ -8,9 +8,15 @@ LABEL author="Parker" maintainer="parker@pterodactyl.io" # UID 999 is the default pterodactyl user RUN adduser -D -h /home/container container +RUN apk add --no-cache tini curl iproute2 ca-certificates fontconfig git openssl sqlite tar tzdata + USER container ENV HOME /home/container WORKDIR /home/container -COPY ../entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] +STOPSIGNAL SIGINT + +COPY --chown=container:container ../entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh +ENTRYPOINT ["/sbin/tini", "-g", "--"] +CMD ["/entrypoint.sh"] diff --git a/postgres/13/Dockerfile b/postgres/13/Dockerfile index ed1d229ae..d86c0337f 100644 --- a/postgres/13/Dockerfile +++ b/postgres/13/Dockerfile @@ -8,9 +8,15 @@ LABEL author="Parker" maintainer="parker@pterodactyl.io" # UID 999 is the default pterodactyl user RUN adduser -D -h /home/container container +RUN apk add --no-cache tini curl iproute2 ca-certificates fontconfig git openssl sqlite tar tzdata + USER container ENV HOME /home/container WORKDIR /home/container -COPY ../entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] +STOPSIGNAL SIGINT + +COPY --chown=container:container ../entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh +ENTRYPOINT ["/sbin/tini", "-g", "--"] +CMD ["/entrypoint.sh"] diff --git a/postgres/14/Dockerfile b/postgres/14/Dockerfile index c41ec76a7..4c8b01978 100644 --- a/postgres/14/Dockerfile +++ b/postgres/14/Dockerfile @@ -8,9 +8,15 @@ LABEL author="Parker" maintainer="parker@pterodactyl.io" # UID 999 is the default pterodactyl user RUN adduser -D -h /home/container container +RUN apk add --no-cache tini curl iproute2 ca-certificates fontconfig git openssl sqlite tar tzdata fontconfig git openssl sqlite tar tzdata + USER container ENV HOME /home/container WORKDIR /home/container -COPY ../entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] +STOPSIGNAL SIGINT + +COPY --chown=container:container ../entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh +ENTRYPOINT ["/sbin/tini", "-g", "--"] +CMD ["/entrypoint.sh"] \ No newline at end of file diff --git a/postgres/9/Dockerfile b/postgres/9/Dockerfile index fc94f1c46..d1b5840a6 100644 --- a/postgres/9/Dockerfile +++ b/postgres/9/Dockerfile @@ -8,9 +8,14 @@ LABEL author="Parker" maintainer="parker@pterodactyl.io" # UID 999 is the default pterodactyl user RUN adduser -D -h /home/container container +RUN apk add --no-cache tini curl iproute2 ca-certificates fontconfig git openssl sqlite tar tzdata USER container ENV HOME /home/container WORKDIR /home/container -COPY ../entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] +STOPSIGNAL SIGINT + +COPY --chown=container:container ../entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh +ENTRYPOINT ["/sbin/tini", "-g", "--"] +CMD ["/entrypoint.sh"] \ No newline at end of file