Rust: Carbon repo changed

* Fix SteamCMD error checking

Added `libcurl` as an excluded keyword for error checking. Was causing mod-timeout errors to be misreported as an unknown error.

.github/workflows/apps.yml

@@ -0,0 +1,43 @@
+name: build apps
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 0 * * 1"
+  push:
+    branches:
+      - master
+    paths:
+      - apps/**
+jobs:
+  push:
+    name: "yolks:apps_${{ matrix.app }}"
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        app:
+          - uptimekuma
+    steps:
+      - uses: actions/checkout@v4
+      
+      - uses: docker/setup-qemu-action@v3
+      
+      - uses: docker/setup-buildx-action@v3
+        with:
+          buildkitd-flags: --debug
+      
+      - uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.REGISTRY_TOKEN }}
+      
+      - uses: docker/build-push-action@v5
+        with:
+          context: ./apps/${{ matrix.app }}
+          file: ./apps/${{ matrix.app }}/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            ghcr.io/pelican-eggs/apps:${{ matrix.app }}
+            ghcr.io/parkervcp/apps:${{ matrix.app }}

.github/workflows/base.yml

@@ -20,21 +20,22 @@ 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.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v3
+      - uses: docker/build-push-action@v5
         with:
           context: ./oses/${{ matrix.oses }}
           file: ./oses/${{ matrix.oses }}/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
+            ghcr.io/pelican-eggs/yolks:${{ matrix.oses }}
             ghcr.io/parkervcp/yolks:${{ matrix.oses }}

.github/workflows/bot.yml

@@ -19,13 +19,14 @@ jobs:
           - parkertron
           - red
           - sinusbot
+          - bastion
     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
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@master
+        uses: docker/setup-qemu-action@v3
         with:
           platforms: arm64,amd64
       - name: Cache Docker layers
@@ -35,12 +36,12 @@ jobs:
           key: ${{ runner.os }}-buildx-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-buildx-
-      - uses: docker/login-action@v2
+      - uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v3
+      - uses: docker/build-push-action@v5
         with:
           context: ./bot/${{ matrix.tag }}
           file: ./bot/${{ matrix.tag }}/Dockerfile
@@ -49,36 +50,37 @@ jobs:
           cache-to: type=local,dest=/tmp/.buildx-cache-new
           push: true
           tags: |
+            ghcr.io/pelican-eggs/yolks:bot_${{ matrix.tag }}
             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:
-          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
-          push: true
-          tags: |
-            ghcr.io/parkervcp/yolks:bot_${{ matrix.tag }}
+  # 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:
+  #         registry: ghcr.io
+  #         username: ${{ github.repository_owner }}
+  #         password: ${{ secrets.REGISTRY_TOKEN }}
+  #     - uses: docker/build-push-action@v5
+  #       with:
+  #         context: ./bot/${{ matrix.tag }}
+  #         file: ./bot/${{ matrix.tag }}/Dockerfile
+  #         platforms: linux/amd64
+  #         push: true
+  #         tags: |
+  #           ghcr.io/parkervcp/yolks:bot_${{ matrix.tag }}

.github/workflows/box64.yml

@@ -18,21 +18,22 @@ 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.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v3
+      - uses: docker/build-push-action@v5
         with:
           context: ./box64
           file: ./${{ matrix.tag }}/Dockerfile
           platforms: linux/arm64
           push: true
           tags: |
+            ghcr.io/pelican-eggs/yolks:${{ matrix.tag }}
             ghcr.io/parkervcp/yolks:${{ matrix.tag }}

.github/workflows/bun.yml

@@ -0,0 +1,40 @@
+name: build bun
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 0 * * 1"
+  push:
+    branches:
+      - master
+    paths:
+      - bun/**
+jobs:
+  push:
+    name: "yolks:bun_${{ matrix.tag }}"
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        tag:
+          - latest
+          - canary
+    steps:
+      - uses: actions/checkout@v4
+      - uses: docker/setup-qemu-action@v3
+      - uses: docker/setup-buildx-action@v3
+        with:
+          buildkitd-flags: --debug
+      - uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.REGISTRY_TOKEN }}
+      - uses: docker/build-push-action@v5
+        with:
+          context: ./bun
+          file: ./bun/${{ matrix.tag }}/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            ghcr.io/pelican-eggs/yolks:bun_${{ matrix.tag }}
+            ghcr.io/parkervcp/yolks:bun_${{ matrix.tag }}

.github/workflows/cassandra.yml

@@ -19,20 +19,21 @@ 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.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v3
+      - uses: docker/build-push-action@v5
         with:
           context: ./cassandra
           file: ./cassandra/${{ matrix.tag }}/Dockerfile
           platforms: linux/amd64
           push: true
           tags: |
+            ghcr.io/pelican-eggs/yolks:cassandra_${{ matrix.tag }}
             ghcr.io/parkervcp/yolks:cassandra_${{ matrix.tag }}

.github/workflows/dart.yml

@@ -16,24 +16,29 @@ jobs:
       fail-fast: false
       matrix:
         tag:
-          - 2.17
+          - '2.17'
+          - '2.18'
+          - '2.19'
+          - '3.3'
+          - 'stable'
     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.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v3
+      - uses: docker/build-push-action@v5
         with:
           context: ./dart
           file: ./dart/${{ matrix.tag }}/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
+            ghcr.io/pelican-eggs/yolks:dart_${{ matrix.tag }}
             ghcr.io/parkervcp/yolks:dart_${{ matrix.tag }}

.github/workflows/dotnet.yml

@@ -21,21 +21,26 @@ jobs:
           - 5
           - 6
           - 7
+          - 8
+          - 9
     steps:
-      - uses: actions/checkout@v3
-      - uses: docker/setup-buildx-action@v2
+      - uses: actions/checkout@v4
+            # Setup QEMU for ARM64 Build
+      - 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.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v3
+      - uses: docker/build-push-action@v5
         with:
           context: ./dotnet
           file: ./dotnet/${{ matrix.tag }}/Dockerfile
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: |
+            ghcr.io/pelican-eggs/yolks:dotnet_${{ matrix.tag }}
             ghcr.io/parkervcp/yolks:dotnet_${{ matrix.tag }}

.github/workflows/elixir.yml

@@ -0,0 +1,43 @@
+name: build elixir
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 0 * * 1"
+  push:
+    branches:
+      - master
+    paths:
+      - elixir/**
+jobs:
+  push:
+    name: "yolks:elixir_${{ matrix.tag }}"
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        tag:
+          - '1.15'
+          - '1.14'
+          - '1.13'
+          - '1.12'
+          - latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: docker/setup-qemu-action@v3
+      - uses: docker/setup-buildx-action@v3
+        with:
+          buildkitd-flags: --debug
+      - uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.REGISTRY_TOKEN }}
+      - uses: docker/build-push-action@v5
+        with:
+          context: ./elixir
+          file: ./elixir/${{ matrix.tag }}/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            ghcr.io/pelican-eggs/yolks:elixir_${{ matrix.tag }}
+            ghcr.io/parkervcp/yolks:elixir_${{ matrix.tag }}

.github/workflows/erlang.yml

@@ -19,21 +19,24 @@ jobs:
           - 22
           - 23
           - 24
+          - 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.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v3
+      - uses: docker/build-push-action@v5
         with:
           context: ./erlang
           file: ./erlang/${{ matrix.tag }}/Dockerfile
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: |
+            ghcr.io/pelican-eggs/yolks:erlang_${{ matrix.tag }}
             ghcr.io/parkervcp/yolks:erlang_${{ matrix.tag }}

.github/workflows/games.yml

@@ -9,8 +9,8 @@ on:
     paths:
       - games/**
 jobs:
-  push:
-    name: "games:${{ matrix.game }}"
+  pushAMD64:
+    name: "games_AMD64:${{ matrix.game }}"
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -18,27 +18,62 @@ jobs:
         game:
           - altv
           - arma3
-          - dayz
+          - dayz                
           - mohaa
+          - rust
           - samp
           - source
           - valheim
+          - thebattleforwesnoth
           
     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.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v3
+      - uses: docker/build-push-action@v5
         with:
           context: ./games/${{ matrix.game }}
           file: ./games/${{ matrix.game }}/Dockerfile
           platforms: linux/amd64
           push: true
           tags: |
+            ghcr.io/pelican-eggs/games:${{ matrix.game }}
+            ghcr.io/parkervcp/games:${{ matrix.game }}
+  pushAll:
+    name: "games_All:${{ matrix.game }}"
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        game:
+          - minetest
+          - mta
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: arm64,amd64
+      - uses: docker/setup-buildx-action@v3
+        with:
+          buildkitd-flags: --debug
+      - uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.REGISTRY_TOKEN }}
+      - uses: docker/build-push-action@v5
+        with:
+          context: ./games/${{ matrix.game }}
+          file: ./games/${{ matrix.game }}/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            ghcr.io/pelican-eggs/games:${{ matrix.game }}
             ghcr.io/parkervcp/games:${{ matrix.game }}

.github/workflows/go.yml

@@ -16,27 +16,32 @@ jobs:
       fail-fast: false
       matrix:
         tag:
-          - 1.14
-          - 1.15
-          - 1.16
-          - 1.17
-          - 1.18
-          - 1.19
+          - '1.14'
+          - '1.15'
+          - '1.16'
+          - '1.17'
+          - '1.18'
+          - '1.19'
+          - '1.20'
+          - '1.21'
+          - '1.22'
+          - '1.23'
     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.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v3
+      - uses: docker/build-push-action@v5
         with:
           context: ./go
           file: ./go/${{ matrix.tag }}/Dockerfile
           platforms: linux/amd64
           push: true
           tags: |
+            ghcr.io/pelican-eggs/yolks:go_${{ matrix.tag }}
             ghcr.io/parkervcp/yolks:go_${{ matrix.tag }}

.github/workflows/installers.yml

@@ -20,20 +20,22 @@ jobs:
           - debian
           - ubuntu
     steps:
-      - uses: actions/checkout@v3
-      - 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.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v3
+      - uses: docker/build-push-action@v5
         with:
           context: ./installers
           file: ./installers/${{ matrix.tag }}/Dockerfile
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: |
+            ghcr.io/pelican-eggs/installers:${{ matrix.tag }}
             ghcr.io/parkervcp/installers:${{ matrix.tag }}

.github/workflows/java.yml

@@ -24,22 +24,24 @@ jobs:
 #          - 16j9
           - 17
           - 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.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v3
+      - uses: docker/build-push-action@v5
         with:
           context: ./java
           file: ./java/${{ matrix.tag }}/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
+            ghcr.io/pelican-eggs/yolks:java_${{ matrix.tag }}
             ghcr.io/parkervcp/yolks:java_${{ matrix.tag }}

.github/workflows/mariadb.yml

@@ -22,22 +22,26 @@ jobs:
           - '10.5'
           - '10.6'
           - '10.7'
+          - '11.2'
+          - '11.3'
+          - '11.4'
     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.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v3
+      - uses: docker/build-push-action@v5
         with:
           context: ./mariadb
           file: ./mariadb/${{ matrix.tag }}/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
+            ghcr.io/pelican-eggs/yolks:mariadb_${{ matrix.tag }}
             ghcr.io/parkervcp/yolks:mariadb_${{ matrix.tag }}

.github/workflows/mongodb.yml

@@ -20,22 +20,24 @@ jobs:
           - 4
           - 5
           - 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.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v3
+      - uses: docker/build-push-action@v5
         with:
           context: ./mongodb
           file: ./mongodb/${{ matrix.tag }}/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
+            ghcr.io/pelican-eggs/yolks:mongodb_${{ matrix.tag }}
             ghcr.io/parkervcp/yolks:mongodb_${{ matrix.tag }}

.github/workflows/mono.yml

@@ -18,20 +18,21 @@ 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.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v3
+      - uses: docker/build-push-action@v5
         with:
           context: ./mono
           file: ./mono/${{ matrix.tag }}/Dockerfile
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: |
+            ghcr.io/pelican-eggs/yolks:mono_${{ matrix.tag }}
             ghcr.io/parkervcp/yolks:mono_${{ matrix.tag }}

.github/workflows/nodejs.yml

@@ -21,23 +21,29 @@ jobs:
           - 16
           - 17
           - 18
+          - 19
+          - 20
+          - 21
+          - 22
+          - 23
     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.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v3
+      - uses: docker/build-push-action@v5
         with:
           context: ./nodejs
           file: ./nodejs/${{ matrix.tag }}/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
+            ghcr.io/pelican-eggs/yolks:nodejs_${{ matrix.tag }}
             ghcr.io/parkervcp/yolks:nodejs_${{ matrix.tag }}

.github/workflows/postgres.yml

@@ -23,22 +23,24 @@ jobs:
           - 12
           - 13
           - 14
+          - 16
     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.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v2
+      - uses: docker/build-push-action@v5
         with:
           context: ./postgres
           file: ./postgres/${{ matrix.tag }}/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
+            ghcr.io/pelican-eggs/yolks:postgres_${{ matrix.tag }}
             ghcr.io/parkervcp/yolks:postgres_${{ matrix.tag }}

.github/workflows/python.yml

@@ -22,23 +22,26 @@ jobs:
           - '3.9'
           - '3.10'
           - '3.11'
+          - '3.12'
+          - '3.13'
     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.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v3
+      - uses: docker/build-push-action@v5
         with:
           context: ./python
           file: ./python/${{ matrix.tag }}/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
+            ghcr.io/pelican-eggs/yolks:python_${{ matrix.tag }}
             ghcr.io/parkervcp/yolks:python_${{ matrix.tag }}

.github/workflows/redis.yml

@@ -21,21 +21,22 @@ 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.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v2
+      - uses: docker/build-push-action@v5
         with:
           context: ./redis
           file: ./redis/${{ matrix.tag }}/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
+            ghcr.io/pelican-eggs/yolks:redis_${{ matrix.tag }}
             ghcr.io/parkervcp/yolks:redis_${{ matrix.tag }}

.github/workflows/rust.yml

@@ -16,27 +16,27 @@ jobs:
       fail-fast: false
       matrix:
         tag:
-          - '1.31'
           - '1.56'
           - '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.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v3
+      - uses: docker/build-push-action@v5
         with:
           context: ./rust
           file: ./rust/${{ matrix.tag }}/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
+            ghcr.io/pelican-eggs/yolks:rust_${{ matrix.tag }}
             ghcr.io/parkervcp/yolks:rust_${{ matrix.tag }}

.github/workflows/steamcmd.yml

@@ -19,22 +19,25 @@ jobs:
           - debian
           - ubuntu
           - dotnet
-      
+          - proton
+          - proton_8   
+          - sniper
     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.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v3
+      - uses: docker/build-push-action@v5
         with:
           context: ./steamcmd
           file: ./steamcmd/${{ matrix.distro }}/Dockerfile
           platforms: linux/amd64
           push: true
           tags: |
+            ghcr.io/pelican-eggs/steamcmd:${{ matrix.distro }}
             ghcr.io/parkervcp/steamcmd:${{ matrix.distro }}

.github/workflows/voice.yml

@@ -18,23 +18,25 @@ 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.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v3
+      - uses: docker/build-push-action@v5
         with:
           context: ./voice/${{ matrix.tag }}
           file: ./voice/${{ matrix.tag }}/Dockerfile
           platforms: linux/amd64
           push: true
           tags: |
-             ghcr.io/parkervcp/yolks:voice_${{ matrix.tag }}
+            ghcr.io/pelican-eggs/yolks:voice_${{ matrix.tag }}
+            ghcr.io/parkervcp/yolks:voice_${{ matrix.tag }}
+
 
   pushx64_arm64:
     name: "yolks:voice_${{ matrix.tag }}"
@@ -45,23 +47,24 @@ 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 }}
           password: ${{ secrets.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v3
+      - uses: docker/build-push-action@v5
         with:
           context: ./voice/${{ matrix.tag }}
           file: ./voice/${{ matrix.tag }}/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-             ghcr.io/parkervcp/yolks:voice_${{ matrix.tag }}
+            ghcr.io/pelican-eggs/yolks:voice_${{ matrix.tag }}
+            ghcr.io/parkervcp/yolks:voice_${{ matrix.tag }}

.github/workflows/wine.yml

@@ -17,22 +17,24 @@ jobs:
       matrix:
         tag:
           - latest
+          - 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.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v3
+      - uses: docker/build-push-action@v5
         with:
           context: ./wine
           file: ./wine/${{ matrix.tag }}/Dockerfile
           platforms: linux/amd64
           push: true
           tags: |
+            ghcr.io/pelican-eggs/yolks:wine_${{ matrix.tag }}
             ghcr.io/parkervcp/yolks:wine_${{ matrix.tag }}

README.md

@@ -35,6 +35,11 @@ is tagged correctly.
 * [ubuntu](/oses/ubuntu)
   * `ghcr.io/parkervcp/yolks:ubuntu`
 
+### [Apps](/apps)
+
+* [`uptimekuma`](/apps/uptimekuma)
+  * `ghcr.io/parkervcp/yolks:apps_uptimekuma`
+
 ### [Bot](/bot)
 
 * [`bastion`](/bot/bastion)
@@ -51,6 +56,13 @@ is tagged correctly.
 * [`Box64`](/box64)
   * `ghcr.io/parkervcp/yolks:box64`
 
+### [Bun](/bun)
+
+* [`Bun Canary`](/bun/canary)
+  * `ghcr.io/parkervcp/yolks:bun_canary`
+* [`Bun Latest`](/bun/latest)
+  * `ghcr.io/parkervcp/yolks:bun_latest`
+
 ### [Cassandra](/cassandra)
 
 * [`cassandra_java8_python27`](/cassandra/cassandra_java8_python2)
@@ -62,6 +74,14 @@ is tagged correctly.
 
 * [`dart2.17`](/dart/2.17)
   * `ghcr.io/parkervcp/yolks:dart_2.17`
+* [`dart2.18`](/dart/2.18)
+  * `ghcr.io/parkervcp/yolks:dart_2.18`
+* [`dart2.19`](/dart/2.19)
+  * `ghcr.io/parkervcp/yolks:dart_2.19`
+* [`dart3.3`](/dart/3.3)
+  * `ghcr.io/parkervcp/yolks:dart_3.3`
+* [`dart stable`](/dart/stable)
+  * `ghcr.io/parkervcp/yolks:dart_stable`
 
 ### [dotNet](/dotnet)
 
@@ -75,6 +95,23 @@ is tagged correctly.
   * `ghcr.io/parkervcp/yolks:dotnet_6`
 * [`dotnet7.0`](/dotnet/7)
   * `ghcr.io/parkervcp/yolks:dotnet_7`
+* [`dotnet8.0`](/dotnet/8)
+  * `ghcr.io/parkervcp/yolks:dotnet_8`
+* [`dotnet9.0`](/dotnet/9)
+  * `ghcr.io/parkervcp/yolks:dotnet_9`
+
+### [Elixir](/elixir)
+
+* [`elixir 1.12`](/elixir/1.12)
+  * `ghcr.io/parkervcp/yolks:elixir_1.12`
+* [`elixir 1.13`](/elixir/1.13)
+  * `ghcr.io/parkervcp/yolks:elixir_1.13`
+* [`elixir 1.14`](/elixir/1.14)
+  * `ghcr.io/parkervcp/yolks:elixir_1.14`
+* [`elixir 1.15`](/elixir/1.12)
+  * `ghcr.io/parkervcp/yolks:elixir_1.15`
+* [`elixir latest`](/elixir/latest)
+  * `ghcr.io/parkervcp/yolks:elixir_latest`
 
 ### [Erlang](/erlang)
 
@@ -93,12 +130,20 @@ is tagged correctly.
   * `ghcr.io/parkervcp/games:arma3`
 * [`dayz`](/games/dayz)
   * `ghcr.io/parkervcp/games:dayz`
+* [`minetest`](/games/minetest)
+  * `ghcr.io/parkervcp/games:minetest`  
 * [`mohaa`](games/mohaa)
-  * `ghcr.io/pterodactyl/games:mohaa`  
+  * `ghcr.io/parkervcp/games:mohaa`  
+* [`Multi Theft Auto: San Andreas`](games/mta)
+  * `ghcr.io/parkervcp/games:mta` 
+* [`Rust (dedicated server)`](games/rust)
+  * `ghcr.io/parkervcp/games:rust`      
 * [`samp`](/games/samp)
   * `ghcr.io/parkervcp/games:samp`  
 * [`source`](/games/source)
   * `ghcr.io/parkervcp/games:source`
+* [`thebattleforwesnoth`](/games/thebattleforwesnoth)
+  * `ghcr.io/parkervcp/games:thebattleforwesnoth`
 * [`valheim`](/games/valheim)
   * `ghcr.io/parkervcp/games:valheim`
 
@@ -116,6 +161,14 @@ is tagged correctly.
   * `ghcr.io/parkervcp/yolks:go_1.18`
 * [`go1.19`](/go/1.19)
   * `ghcr.io/parkervcp/yolks:go_1.19`
+* [`go1.20`](/go/1.20)
+  * `ghcr.io/parkervcp/yolks:go_1.20`
+* [`go1.21`](/go/1.21)
+  * `ghcr.io/parkervcp/yolks:go_1.21`
+* [`go1.22`](/go/1.22)
+  * `ghcr.io/parkervcp/yolks:go_1.22`
+* [`go1.23`](/go/1.23)
+  * `ghcr.io/parkervcp/yolks:go_1.23`
 
 ### [Java](/java)
 
@@ -129,6 +182,8 @@ is tagged correctly.
   * `ghcr.io/parkervcp/yolks:java_17`
 * [`java19`](/java/19)
   * `ghcr.io/parkervcp/yolks:java_19`
+* [`java21`](/java/21)
+  * `ghcr.io/parkervcp/yolks:java_21`
 
 ### [MariaDB](/mariadb)
 
@@ -142,6 +197,12 @@ is tagged correctly.
     * `ghcr.io/parkervcp/yolks:mariadb_10.6`
   * [`MariaDB 10.7`](/mariadb/10.7)
     * `ghcr.io/parkervcp/yolks:mariadb_10.7`
+  * [`MariaDB 11.2`](/mariadb/11.2)
+    * `ghcr.io/parkervcp/yolks:mariadb_11.2`
+  * [`MariaDB 11.3`](/mariadb/11.3)
+    * `ghcr.io/parkervcp/yolks:mariadb_11.3`
+  * [`MariaDB 11.4`](/mariadb/11.4)
+    * `ghcr.io/parkervcp/yolks:mariadb_11.4`
 
 ### [MongoDB](/mongodb)
 
@@ -151,6 +212,8 @@ is tagged correctly.
     * `ghcr.io/parkervcp/yolks:mongodb_5`
  * [`MongoDB 6`](/mongodb/6)
     * `ghcr.io/parkervcp/yolks:mongodb_6`    
+ * [`MongoDB 7`](/mongodb/7)
+    * `ghcr.io/parkervcp/yolks:mongodb_7`
 
 ### [Mono](/mono)
 
@@ -169,7 +232,17 @@ is tagged correctly.
   * `ghcr.io/parkervcp/yolks:nodejs_17`
 * [`node18`](/nodejs/18)
   * `ghcr.io/parkervcp/yolks:nodejs_18`
-
+* [`node19`](/nodejs/19)
+  * `ghcr.io/parkervcp/yolks:nodejs_19`
+* [`node20`](/nodejs/20)
+  * `ghcr.io/parkervcp/yolks:nodejs_20`
+* [`node21`](/nodejs/21)
+  * `ghcr.io/parkervcp/yolks:nodejs_21`
+* [`node22`](/nodejs/22)
+  * `ghcr.io/parkervcp/yolks:nodejs_22`  
+* [`node23`](/nodejs/23)
+  * `ghcr.io/parkervcp/yolks:nodejs_23`
+  
 ### [PostgreSQL](/postgres)
 
   * [`Postgres 9`](/postgres/9)
@@ -197,6 +270,10 @@ is tagged correctly.
   * `ghcr.io/parkervcp/yolks:python_3.10`
 * [`python3.11`](/python/3.11)
   * `ghcr.io/parkervcp/yolks:python_3.11`
+* [`python3.12`](/python/3.12)
+  * `ghcr.io/parkervcp/yolks:python_3.12`
+* [`python3.13`](/python/3.13)
+  * `ghcr.io/parkervcp/yolks:python_3.13`
 
 ### [Redis](/redis)
 
@@ -209,8 +286,6 @@ is tagged correctly.
 
 ### [Rust](/rust)
 
-* ['rust1.31'](/rust/1.31)
-  * `ghcr.io/parkervcp/yolks:rust_1.31`
 * ['rust1.56'](/rust/1.56)
   * `ghcr.io/parkervcp/yolks:rust_1.56`
 * ['rust1.60'](/rust/1.60)
@@ -223,6 +298,12 @@ is tagged correctly.
   * `ghcr.io/parkervcp/steamcmd:debian`
 * [`SteamCMD Debian Dotnet`](/steamcmd/dotnet)
   * `ghcr.io/parkervcp/steamcmd:dotnet`
+* [`SteamCMD Proton`](/steamcmd/proton)
+  * `ghcr.io/parkervcp/steamcmd:proton`
+* [`SteamCMD Proton`](/steamcmd/proton_8)
+  * `ghcr.io/parkervcp/steamcmd:proton_8`
+* [`SteamCMD Sniper latest`](/steamcmd/sniper)
+  * `ghcr.io/parkervcp/steamcmd:sniper`
 * [`SteamCMD Ubuntu latest LTS`](/steamcmd/ubuntu)
   * `ghcr.io/parkervcp/steamcmd:ubuntu`
 
@@ -236,6 +317,7 @@ is tagged correctly.
 
 * [`Wine`](/wine)
   * `ghcr.io/parkervcp/yolks:wine_latest`
+  * `ghcr.io/parkervcp/yolks:wine_devel`
   * `ghcr.io/parkervcp/yolks:wine_staging`
 
 ### [Installation Images](/installers)

apps/uptimekuma/Dockerfile

@@ -0,0 +1,62 @@
+FROM        --platform=$TARGETOS/$TARGETARCH node:18-alpine
+
+LABEL       author="Torsten Widmann" maintainer="info@goover.de"
+LABEL       org.opencontainers.image.source="https://github.com/gOOvER/own-pterodactyl-images"
+LABEL       org.opencontainers.image.licenses=MIT
+
+RUN         apk update \
+            && apk upgrade
+
+RUN         apk add --no-cache \
+                autoconf \
+                automake \
+                build-base \
+                ca-certificates\
+                chromium \
+                curl \
+                bind-tools \
+				ffmpeg \
+                g++ \
+                git \
+                gpg \
+                gnupg \
+                iproute2 \
+                iputils-ping \
+                libtool \
+                musl \
+                musl-utils \
+                musl-locales \
+                python3 \
+                python3-dev \
+                py3-pip \
+                pipx \
+                sqlite \
+                tzdata \
+                zip \
+                libc6-compat \
+                tini
+
+# updating npm 
+RUN         npm install npm@latest -g
+
+# download cloudflared
+ARG         TARGETPLATFORM
+RUN         if [ "$TARGETPLATFORM" = "linux/amd64" ]; then ARCHITECTURE=amd64; elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then ARCHITECTURE=arm64; fi \
+            && curl -L https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-${ARCHITECTURE} -o /usr/bin/cloudflared
+RUN         chmod +x /usr/bin/cloudflared
+
+# install apprise
+RUN         pipx install apprise
+
+## Setup user and working directory
+RUN         adduser -D -h /home/container container -s /bin/bash container
+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    ["/sbin/tini", "-g", "--"]
+CMD         ["/entrypoint.sh"]

apps/uptimekuma/entrypoint.sh

@@ -0,0 +1,41 @@
+#!/bin/ash
+#System variables
+clear
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+NC='\033[0m'
+
+# Switch to the container's working directory
+cd /home/container || exit 1
+
+# Wait for the container to fully initialize
+sleep 1
+
+# 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-2);exit}')
+export INTERNAL_IP
+
+# system informations
+echo -e "${BLUE}-------------------------------------------------${NC}"
+echo -e "${RED}Uptime Kuma Image${NC}"
+echo -e "${BLUE}-------------------------------------------------${NC}"
+echo -e "${YELLOW}Running on Alpine: ${RED} $(cat /etc/alpine-release)${NC}"
+echo -e "${YELLOW}Current timezone: ${RED} ${TZ} ${NC}"
+echo -e "${YELLOW}NodeJS Version: ${RED} $(node -v) ${NC}"
+echo -e "${YELLOW}Cloudflared Version: ${RED} $(/usr/bin/cloudflared --version) ${NC}"
+echo -e "${BLUE}-------------------------------------------------${NC}"
+
+export PATH=$PATH:/root/.local/bin
+
+# Replace Startup Variables
+MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
+echo ":/home/container$ ${MODIFIED_STARTUP}"
+
+# Run the Server
+eval ${MODIFIED_STARTUP}

bot/bastion/Dockerfile

@@ -1,14 +1,16 @@
-FROM        --platform=$TARGETOS/$TARGETARCH node:18-bullseye
+FROM        --platform=$TARGETOS/$TARGETARCH mongo:7-jammy
 
 LABEL       author="Michael Parker" maintainer="parker@pterodactyl.io"
 
-## install mongo
-RUN wget -qO - https://www.mongodb.org/static/pgp/server-5.0.asc | apt-key add - \
- && echo "deb http://repo.mongodb.org/apt/debian bullseye/mongodb-org/5.0 main" | tee /etc/apt/sources.list.d/mongodb-org-5.0.list \
- && apt update \
- && apt install -y mongodb-org mongodb-org-server mongodb-org-shell mongodb-org-mongos mongodb-org-tools \
+## install nodejs 20
+RUN apt update && apt install --no-install-recommends -y curl apt-transport-https ca-certificates gnupg \ 
+ && mkdir -p /usr/share/keyrings \
+ && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /usr/share/keyrings/nodesource.gpg \
+ && echo "deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
+ && apt update && apt install -y nodejs \
+ && npm install -g npm@latest \
  ## install bastion reqs
- && apt install -y python build-essential git libtool netcat ffmpeg iproute2 curl tzdata \
+ && apt install -y python3 build-essential git libtool netcat ffmpeg iproute2 tzdata tini \
  ## add container user
  && useradd -d /home/container -m container -s /bin/bash
 
@@ -16,5 +18,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"]

bot/bastion/entrypoint.sh

@@ -1,4 +1,21 @@
 #!/bin/bash
+#Variables
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+NC='\033[0m'
+
+clear
+#show versions
+echo -e "${BLUE}-------------------------------------------------${NC}"
+echo -e "${YELLOW}BastionBot Installation${NC}"
+echo -e "${BLUE}-------------------------------------------------${NC}"
+echo -e "${YELLOW}MongoDB Version:${NC} " && mongod --version
+echo -e "${YELLOW}NodeJS Version:${NC} " && node -v
+echo -e "${YELLOW}Python Version:${NC} " && python3 --version
+echo -e "${BLUE}-------------------------------------------------${NC}"
+
 cd /home/container
 
 # Set environment variable that holds the Internal Docker IP
@@ -7,13 +24,19 @@ export INTERNAL_IP
 
 # Replace Startup Variables
 MODIFIED_STARTUP=$(echo -e $(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g'))
-echo -e ":/home/container$ ${MODIFIED_STARTUP}"
+echo -e "${YELLOW}:/home/container${NC} ${MODIFIED_STARTUP}"
 
 # start mongo
-mongod --fork --dbpath /home/container/mongodb/ --port 27017 --logpath /home/container/mongod.log && until nc -z -v -w5 127.0.0.1 27017; do echo 'Waiting for mongodb connection...'; sleep 5; done
+echo -e "${BLUE}-------------------------------------------------${NC}"
+echo -e "${YELLOW}starting MongoDB...${NC}"
+echo -e "${BLUE}-------------------------------------------------${NC}"
+mongod --fork --dbpath /home/container/mongodb/ --port 27017 --logpath /home/container/mongod.log --logRotate reopen --logappend && until nc -z -v -w5 127.0.0.1 27017; do echo 'Waiting for mongodb connection...'; sleep 5; done
 
 # Run the Server
+echo -e "${BLUE}-------------------------------------------------${NC}"
+echo -e "${YELLOW}BastionBot starting...${NC}"
+echo -e "${BLUE}-------------------------------------------------${NC}"
 eval ${MODIFIED_STARTUP}
 
 # stop mongo
-mongo --eval \"db.getSiblingDB('admin').shutdownServer()\
+mongod --eval "db.adminCommand({ "shutdown" : 1 })"

bot/parkertron/Dockerfile

@@ -1,4 +1,4 @@
-FROM    --platform=$TARGETOS/$TARGETARCH debian:bullseye
+FROM    --platform=$TARGETOS/$TARGETARCH debian:bookworm
 
 LABEL   author="Michael Parker" maintainer="parker@pterodactyl.io"
 

bot/red/Dockerfile

@@ -1,19 +1,56 @@
-FROM        --platform=$TARGETOS/$TARGETARCH python:3.8-slim
+FROM          --platform=$TARGETOS/$TARGETARCH python:3.11-slim-bookworm
 
-LABEL       author="Michael Parker" maintainer="parker@pterodactyl.io"
+LABEL         author="Michael Parker" maintainer="parker@pterodactyl.io"
 
-RUN         mkdir -p /usr/share/man/man1 \
-            && apt update \
-            && apt -y install git ca-certificates dnsutils iproute2 wget curl xz-utils git openjdk-11-jre \
-            zlib1g-dev libffi-dev git libmagickwand-dev unzip libaa1-dev build-essential tk-dev libncurses5-dev libncursesw5-dev libreadline6-dev libdb5.3-dev libgdbm-dev libsqlite3-dev libssl-dev libbz2-dev libexpat1-dev liblzma-dev ffmpeg imagemagick \
-            && pip install python-forecastio tweepy unidecode discord-text-sanitizer mcstatus bs4 sqlalchemy geocoder valve python-valve py-cpuinfo psutil \
-            && useradd -m -d /home/container container \
-            && mkdir -p /home/container/.config/Red-DiscordBot/ \
-            && ln -s /home/container/.config/Red-DiscordBot/ /usr/local/share/Red-DiscordBot
 
+RUN           mkdir -p /usr/share/man/man1
+RUN           apt update \
+              && apt -y upgrade \
+              && apt -y install \
+                     git \
+                     ca-certificates \
+                     dnsutils \
+                     iproute2 \
+                     wget \
+                     curl \
+                     xz-utils \
+                     openjdk-17-jre-headless \
+                     zlib1g-dev \
+                     libffi-dev \
+                     libmagickwand-dev \
+                     unzip \
+                     libaa1-dev \
+                     build-essential \
+                     tk-dev \
+                     libncurses5-dev \
+                     libncursesw5-dev \
+                     libreadline6-dev \
+                     libdb5.3-dev \
+                     libgdbm-dev \
+                     libsqlite3-dev \
+                     libssl-dev \
+                     libbz2-dev \
+                     libexpat1-dev \
+                     liblzma-dev \
+                     ffmpeg \
+                     imagemagick \
+			       tini
+
+RUN           pip install --upgrade pip
+RUN           pip install python-forecastio tweepy unidecode mcstatus bs4 sqlalchemy geocoder valve python-valve py-cpuinfo psutil
+
+RUN           mkdir -p /home/container/.config/Red-DiscordBot/
+RUN           ln -s /home/container/.config/Red-DiscordBot/ /usr/local/share/Red-DiscordBot
+
+## Setup user and working directory
+RUN         useradd -m -d /home/container -s /bin/bash container
 USER        container
-ENV         USER=container HOME=/home/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"]

bot/sinusbot/Dockerfile

@@ -1,4 +1,4 @@
-FROM        --platform=$TARGETOS/$TARGETARCH debian:stable-slim
+FROM        --platform=$TARGETOS/$TARGETARCH debian:bookworm-slim
 
 LABEL       org.opencontainers.image.authors="i2007@damw.eu"
 LABEL       version="1.0"
@@ -8,10 +8,11 @@ ENV         DEBIAN_FRONTEND noninteractive
 # Install Dependencies
 RUN         apt update \
             && apt upgrade -y \
-            && apt install -y ca-certificates less locales pulseaudio python python3 sudo x11vnc x11-xkb-utils xvfb iproute2 ffmpeg curl \
-			libasound2 libegl1-mesa libglib2.0-0 libnss3 libpci3 libpulse0 libxcursor1 libxslt1.1 libx11-xcb1 libxkbcommon0 bzip2 libxss1 libxcomposite1 \
+            && apt install -y ca-certificates less locales pulseaudio python3 python3-pip sudo x11vnc x11-xkb-utils xvfb iproute2 ffmpeg curl liblcms2-2 libatomic1 libxcb-xinerama0 \
+			fontconfig libasound2 libegl1-mesa libglib2.0-0 libnss3 libpci3 libpulse0 libxcursor1 libxslt1.1 libx11-xcb1 libxkbcommon0 bzip2 libxss1 libxcomposite1 libevent-2.1-7 \
+			libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-render-util0 libxcb-xkb1 libxkbcommon-x11-0 tini \
             && useradd -m -d /home/container container
-
+#RUN         python3 -m pip install requests
 
 ENV LANG C.UTF-8
 ENV LC_ALL C.UTF-8
@@ -20,5 +21,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"]

bot/sinusbot/entrypoint.sh

@@ -5,6 +5,7 @@ cd /home/container
 INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
 export INTERNAL_IP
 
+
 # Replace Startup Variables
 MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')`
 echo ":/home/container$ ${MODIFIED_STARTUP}"

box64/Dockerfile

@@ -1,4 +1,4 @@
-FROM        --platform=$TARGETOS/$TARGETARCH debian:bullseye-slim
+FROM        --platform=$TARGETOS/$TARGETARCH debian:bookworm-slim
 
 LABEL       author="QuintenQVD" maintainer="josdekurk@gmail.com"
 
@@ -10,8 +10,8 @@ RUN          apt update \
 
 ## Install dependencies
 RUN          apt install -y libc++-dev libc6 git wget curl tar zip unzip binutils xz-utils liblzo2-2 cabextract iproute2 net-tools 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 \
-             libz-dev rapidjson-dev tzdata libevent-dev libzip4 libsdl2-mixer-2.0-0 libsdl2-image-2.0-0 build-essential cmake libgdiplus
+             libfontconfig libicu72 icu-devtools libunwind8 libssl-dev sqlite3 libsqlite3-dev libmariadb-dev libmariadb-dev-compat libduktape207 locales ffmpeg gnupg2 apt-transport-https software-properties-common ca-certificates \
+             libz3-dev rapidjson-dev tzdata libevent-dev libzip4 libsdl2-mixer-2.0-0 libsdl2-image-2.0-0 build-essential cmake libgdiplus libstdc++6
 			 
 ## Configure locale
 RUN          update-locale lang=en_US.UTF-8 \
@@ -20,8 +20,8 @@ RUN          update-locale lang=en_US.UTF-8 \
 
 ##Install box64
 RUN         wget https://ryanfortner.github.io/box64-debs/box64.list -O /etc/apt/sources.list.d/box64.list \
-            && wget -O- https://ryanfortner.github.io/box64-debs/KEY.gpg | gpg --dearmor | tee /usr/share/keyrings/box64-debs-archive-keyring.gpg \
-            && apt update && apt install box64 -y
+            && wget -qO- https://ryanfortner.github.io/box64-debs/KEY.gpg | gpg --dearmor -o /etc/apt/trusted.gpg.d/box64-debs-archive-keyring.gpg  \
+            && apt update && apt install box64-rpi4arm64 -y
 
 
 

bun/canary/Dockerfile

@@ -0,0 +1,20 @@
+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 tini \
+            && useradd -m -d /home/container container
+
+RUN bun upgrade
+
+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"]

bun/entrypoint.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+cd /home/container
+
+# Make internal Docker IP address available to processes.
+INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
+export INTERNAL_IP
+
+# Print Bun Version
+bun -v
+
+# Replace Startup Variables
+MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
+echo -e ":/home/container$ ${MODIFIED_STARTUP}"
+
+# Run the Server
+eval ${MODIFIED_STARTUP}

bun/latest/Dockerfile

@@ -0,0 +1,20 @@
+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 tini \
+            && useradd -m -d /home/container container
+
+RUN bun upgrade
+
+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"]

cassandra/entrypoint.sh

@@ -12,27 +12,27 @@ export INTERNAL_IP
 cd /home/container || exit 1
 
 # Print Java version
-printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0mjava -version\n"
+printf "\033[1m\033[33mcontainer@pelican~ \033[0mjava -version\n"
 java -version
 
 
 # Print Python version
 if command -v python &> /dev/null
 then
-	printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0mpython --version\n"
+	printf "\033[1m\033[33mcontainer@pelican~ \033[0mpython --version\n"
 	python --version
 else
-	printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0mpython3 --version\n"
+	printf "\033[1m\033[33mcontainer@pelican~ \033[0mpython3 --version\n"
 	python3 --version
 fi
 
 # 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 -)")
+PARSED=$(echo "$STARTUP" | sed -e 's/{{/${/g' -e 's/}}/}/g')
 
-# 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"
+# Display the command we're running in the output, and then execute it with eval
+printf "\033[1m\033[33mcontainer@pelican~ \033[0m"
+echo "$PARSED"
 # shellcheck disable=SC2086
-exec env ${PARSED}
+eval "$PARSED"

dart/2.17/Dockerfile

@@ -3,12 +3,16 @@ FROM        --platform=$TARGETOS/$TARGETARCH dart:2.17
 LABEL       author="Alden Bansemer" maintainer="alden@knoban.com"
 
 RUN         apt update \
-            && apt -y install iproute2 git ca-certificates tzdata \
+            && apt -y install iproute2 git ca-certificates tzdata tini \
             && 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" ]
+STOPSIGNAL SIGINT
+
+COPY        --chown=container:container ./../entrypoint.sh /entrypoint.sh
+RUN         chmod +x /entrypoint.sh
+ENTRYPOINT    ["/usr/bin/tini", "-g", "--"]
+CMD         ["/entrypoint.sh"]

dart/2.18/Dockerfile

@@ -0,0 +1,18 @@
+FROM        --platform=$TARGETOS/$TARGETARCH dart:2.18
+
+LABEL       author="Alden Bansemer" maintainer="alden@knoban.com"
+
+RUN         apt update \
+            && apt -y install iproute2 git ca-certificates tzdata tini \
+            && useradd -m -d /home/container container
+
+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"]

dart/2.19/Dockerfile

@@ -0,0 +1,18 @@
+FROM        --platform=$TARGETOS/$TARGETARCH dart:2.19
+
+LABEL       author="Alden Bansemer" maintainer="alden@knoban.com"
+
+RUN         apt update \
+            && apt -y install iproute2 git ca-certificates tzdata tini \
+            && useradd -m -d /home/container container
+
+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"]

dart/3.3/Dockerfile

@@ -0,0 +1,18 @@
+FROM        --platform=$TARGETOS/$TARGETARCH dart:3.3
+
+LABEL       author="Alden Bansemer" maintainer="alden@knoban.com"
+
+RUN         apt update \
+            && apt -y install iproute2 git ca-certificates tzdata tini \
+            && useradd -m -d /home/container container
+
+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"]

dart/stable/Dockerfile

@@ -0,0 +1,18 @@
+FROM        --platform=$TARGETOS/$TARGETARCH dart:stable
+
+LABEL       author="Alden Bansemer" maintainer="alden@knoban.com"
+
+RUN         apt update \
+            && apt -y install iproute2 git ca-certificates tzdata tini \
+            && useradd -m -d /home/container container
+
+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"]

dotnet/2.1/Dockerfile

@@ -6,16 +6,20 @@ 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/11/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-2.1 libgdiplus
+            && 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/2.1 | grep -i  '<h3 id="sdk-2.*">SDK 2.1.*</h3>'  | 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
 
-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"]

dotnet/3.1/Dockerfile

@@ -6,16 +6,21 @@ 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/11/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-3.1 libgdiplus
+            && 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/3.1 | grep -i  '<h3 id="sdk-3.*">SDK 3.1.*</h3>'  | 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
 
-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"]

dotnet/5/Dockerfile

@@ -6,16 +6,20 @@ 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/11/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-5.0 libgdiplus
+            && 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/5.0 | grep -i  '<h3 id="sdk-5.*">SDK 5.*.*</h3>'  | 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
 
-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"]

dotnet/6/Dockerfile

@@ -6,16 +6,20 @@ 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/11/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
+            && 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/6.0 | grep -i  '<h3 id="sdk-6.*">SDK 6.*.*</h3>'  | 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
 
-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"]

dotnet/7/Dockerfile

@@ -1,21 +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 iproute2 \
-            && wget https://packages.microsoft.com/config/debian/11/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-7.0 libgdiplus
-
-USER        container
-ENV         USER=container HOME=/home/container
-WORKDIR     /home/container
-
-COPY        ./../entrypoint.sh /entrypoint.sh
-CMD         [ "/bin/bash", "/entrypoint.sh" ]
+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/7.0 | grep -i  '<h3 id="sdk-7.*">SDK 7.*.*</h3>'  | 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"]

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  '<h3 id="sdk-8.*">SDK 8.*.*</h3>'  | 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"]

dotnet/9/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/9.0 | grep -i  '<h3 id="sdk-9.*">SDK 9.*.*</h3>'  | 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"]

dotnet/entrypoint.sh

@@ -5,6 +5,13 @@ cd /home/container
 INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
 export INTERNAL_IP
 
+# set this variable, dotnet needs it even without it it reports to `dotnet --info` it can not start any aplication without this
+export DOTNET_ROOT=/usr/share/
+
+# print the dotnet version on startup
+printf "\033[1m\033[33mcontainer@pelican~ \033[0mdotnet --version\n"
+dotnet --version
+
 # Replace Startup Variables
 MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
 echo -e ":/home/container$ ${MODIFIED_STARTUP}"

elixir/1.12/Dockerfile

@@ -0,0 +1,18 @@
+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 tini \
+            && useradd -m -d /home/container container
+
+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"]

elixir/1.13/Dockerfile

@@ -0,0 +1,18 @@
+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 tini \
+            && useradd -m -d /home/container container
+
+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"]

elixir/1.14/Dockerfile

@@ -0,0 +1,18 @@
+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 tini \
+            && useradd -m -d /home/container container
+
+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"]

elixir/1.15/Dockerfile

@@ -0,0 +1,18 @@
+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 tini \
+            && useradd -m -d /home/container container
+
+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"]

elixir/entrypoint.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+cd /home/container
+
+# Make internal Docker IP address available to processes.
+INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
+export INTERNAL_IP
+
+# Replace Startup Variables
+MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
+echo -e ":/home/container$ ${MODIFIED_STARTUP}"
+
+# Print Elixir Version
+elixir -e 'IO.puts "Elixir " <> System.version()'
+
+# Run the Server
+eval ${MODIFIED_STARTUP}

elixir/latest/Dockerfile

@@ -0,0 +1,18 @@
+FROM --platform=$TARGETOS/$TARGETARCH elixir:slim
+
+LABEL author="MrAvox" maintainer="mravox@proton.me"
+
+RUN  apt update \
+            && apt -y install git dnsutils curl iproute2 ffmpeg tini \
+            && useradd -m -d /home/container container
+
+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"]

erlang/22/Dockerfile

@@ -5,7 +5,7 @@ LABEL       author="Pascal Zarrad" maintainer="p.zarrad@outlook.de"
 LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolks"
 LABEL       org.opencontainers.image.licenses=MIT
 
-RUN         apk add --update --no-cache ca-certificates curl git openssl sqlite tar tzdata \
+RUN         apk add --update --no-cache ca-certificates curl git openssl sqlite tar tzdata iproute2 \
 				&& adduser -D -h /home/container container
 
 USER        container

erlang/23/Dockerfile

@@ -5,7 +5,7 @@ LABEL       author="Pascal Zarrad" maintainer="p.zarrad@outlook.de"
 LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolks"
 LABEL       org.opencontainers.image.licenses=MIT
 
-RUN         apk add --update --no-cache ca-certificates curl git openssl sqlite tar tzdata \
+RUN         apk add --update --no-cache ca-certificates curl git openssl sqlite tar tzdata  iproute2\
 				&& adduser -D -h /home/container container
 
 USER        container

erlang/24/Dockerfile

@@ -5,7 +5,7 @@ LABEL       author="Pascal Zarrad" maintainer="p.zarrad@outlook.de"
 LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolks"
 LABEL       org.opencontainers.image.licenses=MIT
 
-RUN         apk add --update --no-cache ca-certificates curl git openssl sqlite tar tzdata \
+RUN         apk add --update --no-cache ca-certificates curl git openssl sqlite tar tzdata iproute2 \
 				&& adduser -D -h /home/container container
 
 USER        container

erlang/25/Dockerfile

@@ -0,0 +1,16 @@
+FROM        --platform=$TARGETOS/$TARGETARCH erlang:25-alpine
+
+LABEL       author="Pascal Zarrad" maintainer="p.zarrad@outlook.de"
+
+LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolks"
+LABEL       org.opencontainers.image.licenses=MIT
+
+RUN         apk add --update --no-cache ca-certificates curl git openssl sqlite tar tzdata iproute2 \
+				&& 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" ]

erlang/26/Dockerfile

@@ -0,0 +1,16 @@
+FROM        --platform=$TARGETOS/$TARGETARCH erlang:26-alpine
+
+LABEL       author="Pascal Zarrad" maintainer="p.zarrad@outlook.de"
+
+LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolks"
+LABEL       org.opencontainers.image.licenses=MIT
+
+RUN         apk add --update --no-cache ca-certificates curl git openssl sqlite tar tzdata iproute2 \
+				&& 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" ]

erlang/entrypoint.sh

@@ -10,16 +10,16 @@ export INTERNAL_IP
 cd /home/container || exit 1
 
 # Print Erlang's version
-printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0merl -noshell -eval 'erlang:display(erlang:system_info(system_version))' -eval 'init:stop()'\n"
+printf "\033[1m\033[33mcontainer@pelican~ \033[0merl -noshell -eval 'erlang:display(erlang:system_info(system_version))' -eval 'init:stop()'\n"
 erl -noshell -eval 'erlang:display(erlang:system_info(system_version))' -eval 'init:stop()'
 
 # 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 -)")
+PARSED=$(echo "$STARTUP" | sed -e 's/{{/${/g' -e 's/}}/}/g')
 
-# 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"
+# Display the command we're running in the output, and then execute it with eval
+printf "\033[1m\033[33mcontainer@pelican~ \033[0m"
+echo "$PARSED"
 # shellcheck disable=SC2086
-exec env ${PARSED}
+eval "$PARSED"

games/altv/Dockerfile

@@ -1,7 +1,7 @@
 # ----------------------------------
 # Environment: debian
 # ----------------------------------
-FROM    --platform=$TARGETOS/$TARGETARCH node:16-bullseye
+FROM    --platform=$TARGETOS/$TARGETARCH node:16-bookworm
 
 LABEL   author="goover" maintainer="info@goover.de"
 
@@ -11,14 +11,14 @@ RUN     useradd -m -d /home/container -s /bin/bash container
 
 RUN     apt update -y \
         && apt upgrade -y \
-        && apt install -y g++ gcc libgcc-s1 lib32gcc-s1 gdb libstdc++6 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 \
-        libfontconfig1 libicu67 icu-devtools libunwind8 libssl-dev sqlite3 libsqlite3-dev libmariadb-dev libduktape205 locales ffmpeg gnupg2 apt-transport-https software-properties-common ca-certificates tzdata \
-		python3 dnsutils build-essential coreutils jq pcregrep
+        && apt install -y g++ gcc libgcc-s1 lib32gcc-s1 gdb libstdc++6 libc6 git wget curl tar zip unzip binutils xz-utils liblzo2-2 cabextract iproute2 net-tools netcat-traditional telnet libatomic1 libsdl1.2debian libsdl2-2.0-0 \
+        libfontconfig1 libicu72 icu-devtools libunwind8 libssl-dev sqlite3 libsqlite3-dev libmariadb-dev libduktape207 locales ffmpeg gnupg2 apt-transport-https software-properties-common ca-certificates tzdata libgdiplus\ 
+		python3 dnsutils build-essential coreutils jq pcregrep tini
 
-RUN     wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
+RUN     wget https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
         && dpkg -i packages-microsoft-prod.deb \
         && apt update -y \
-        && apt install -y dotnet-sdk-5.0 dotnet-sdk-6.0 dotnet-sdk-7.0 libgdiplus
+        && apt install -y dotnet-sdk-6.0 dotnet-sdk-7.0 dotnet-sdk-8.0 libgdiplus
 
 RUN     update-locale lang=en_US.UTF-8 \
         && dpkg-reconfigure --frontend noninteractive locales
@@ -27,5 +27,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"]

games/arma3/Dockerfile

@@ -1,6 +1,6 @@
-FROM        --platform=$TARGETOS/$TARGETARCH debian:stable-slim
+FROM        --platform=$TARGETOS/$TARGETARCH debian:bullseye-slim
 
-LABEL       author="David Wolfe (Red-Thirten)" maintainer="rehlmgaming@gmail.com"
+LABEL       author="David Wolfe (Red-Thirten)" maintainer="red_thirten@yahoo.com"
 
 LABEL       org.opencontainers.image.source="https://github.com/parkervcp/yolks"
 LABEL       org.opencontainers.image.licenses=MIT
@@ -28,7 +28,8 @@ RUN         dpkg --add-architecture i386 \
                 libnss-wrapper \
                 libnss-wrapper:i386 \
                 libtbb2 \
-                libtbb2:i386
+                libtbb2:i386 \
+                tini
 
 ## Configure locale
 RUN         update-locale lang=en_US.UTF-8 \
@@ -47,6 +48,11 @@ 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" ]
+## Copy over entrypoint.sh and set permissions
+COPY        --chown=container:container ./entrypoint.sh /entrypoint.sh
+RUN         chmod +x /entrypoint.sh
+
+## Start with Tini to pass future stop signals correctly
+STOPSIGNAL  SIGINT
+ENTRYPOINT  ["/usr/bin/tini", "-g", "--"]
+CMD         ["/entrypoint.sh"]

games/arma3/entrypoint.sh

@@ -54,7 +54,9 @@ function RunSteamCMD { #[Input: int server=0 mod=1 optional_mod=2; int id]
 
         # Error checking for SteamCMD
         steamcmdExitCode=${PIPESTATUS[0]}
-        if [[ -n $(grep -i "error\|failed" "${STEAMCMD_LOG}" | grep -iv "setlocal\|SDL\|thread") ]]; then # Catch errors (ignore setlocale, SDL, and thread priority warnings)
+        # Catch errors (ignore setlocale, SDL, steamservice, thread priority, and libcurl warnings)
+        loggedErrors=$(grep -i "error\|failed" "${STEAMCMD_LOG}" | grep -iv "setlocal\|SDL\|steamservice\|thread\|libcurl")
+        if [[ -n ${loggedErrors} ]]; then
             # Soft errors
             if [[ -n $(grep -i "Timeout downloading item" "${STEAMCMD_LOG}") ]]; then # Mod download timeout
                 echo -e "\n${YELLOW}[UPDATE]: ${NC}Timeout downloading Steam Workshop mod: \"${CYAN}${modName}${NC}\" (${CYAN}${2}${NC})"
@@ -72,7 +74,8 @@ function RunSteamCMD { #[Input: int server=0 mod=1 optional_mod=2; int id]
                 echo -e "\n${RED}[UPDATE]: Cannot login to Steam - Improperly configured account and/or credentials"
                 echo -e "\t${YELLOW}Please contact your administrator/host and give them the following message:${NC}"
                 echo -e "\t${CYAN}Your Egg, or your client's server, is not configured with valid Steam credentials.${NC}"
-                echo -e "\t${CYAN}Either the username/password is wrong, or Steam Guard is not properly configured\n\taccording to this egg's documentation/README.${NC}\n"
+                echo -e "\t${CYAN}Either the username/password is wrong, or Steam Guard is not properly configured"
+                echo -e "\t${CYAN}according to this egg's documentation/README.${NC}\n"
                 exit 1
             elif [[ -n $(grep -i "Download item" "${STEAMCMD_LOG}") ]]; then # Steam account does not own base game for mod downloads, or unknown
                 echo -e "\n${RED}[UPDATE]: Cannot download mod - Download failed"
@@ -86,12 +89,14 @@ function RunSteamCMD { #[Input: int server=0 mod=1 optional_mod=2; int id]
                 exit 1
             elif [[ -n $(grep -i "0x606" "${STEAMCMD_LOG}") ]]; then # Disk write failure
                 echo -e "\n${RED}[UPDATE]: Unable to complete download - Disk write failure"
-                echo -e "\t${YELLOW}This is normally caused by directory permissions issues,\n\tbut could be a more serious hardware issue.${NC}"
+                echo -e "\t${YELLOW}This is normally caused by directory permissions issues,"
+                echo -e "\t${YELLOW}but could be a more serious hardware issue.${NC}"
                 echo -e "\t${YELLOW}(Please contact your administrator/host if this issue persists)${NC}\n"
                 exit 1
             else # Unknown caught error
                 echo -e "\n${RED}[UPDATE]: ${YELLOW}An unknown error has occurred with SteamCMD. ${CYAN}Skipping download...${NC}"
-                echo -e "\t(Please contact your administrator/host if this issue persists)"
+                echo -e "SteamCMD Errors:\n${loggedErrors}"
+                echo -e "\t${YELLOW}(Please contact your administrator/host if this issue persists)${NC}\n"
                 break
             fi
         elif [[ $steamcmdExitCode != 0 ]]; then # Unknown fatal error
@@ -222,7 +227,7 @@ allMods=$(echo $allMods | sed -e 's/;/ /g') # Convert from string to array
 # Update everything (server and mods), if specified
 if [[ ${UPDATE_SERVER} == 1 ]]; then
     echo -e "\n${GREEN}[STARTUP]: ${CYAN}Starting checks for all updates...${NC}"
-    echo -e "(It is okay to ignore any \"SDL\" and \"thread priority\" errors during this process)\n"
+    echo -e "(It is okay to ignore any \"SDL\", \"steamservice\", and \"thread priority\" errors during this process)\n"
 
     ## Update game server
     echo -e "${GREEN}[UPDATE]:${NC} Checking for game server updates with App ID: ${CYAN}${STEAMCMD_APPID}${NC}..."
@@ -342,6 +347,12 @@ if [[ ${MODS_LOWERCASE} == "1" ]]; then
     done
 fi
 
+# Define the log file path with a timestamp
+LOG_FILE="/home/container/serverprofile/rpt/arma3server_$(date '+%m_%d_%Y_%H%M%S').rpt"
+
+# Ensure the logs directory exists
+mkdir -p /home/container/serverprofile/rpt
+
 # Clear HC cache, if specified
 if [[ ${CLEAR_CACHE} == "1" ]]; then
     echo -e "\n${GREEN}[STARTUP]: ${CYAN}Clearing Headless Client profiles cache...${NC}"
@@ -391,7 +402,11 @@ fi
 # Start the Server
 echo -e "\n${GREEN}[STARTUP]:${NC} Starting server with the following startup command:"
 echo -e "${CYAN}${modifiedStartup}${NC}\n"
-${modifiedStartup}
+if [[ "$STARTUP_PARAMS" == *"-noLogs"* ]]; then
+	${modifiedStartup}
+else
+    ${modifiedStartup} 2>&1 | tee -a "$LOG_FILE"
+fi
 
 if [ $? -ne 0 ]; then
     echo -e "\n${RED}PTDL_CONTAINER_ERR: There was an error while attempting to run the start command.${NC}\n"

games/dayz/Dockerfile

@@ -1,8 +1,8 @@
-FROM        --platform=$BUILDPLATFORM debian:stable-slim
+FROM        --platform=$TARGETOS/$TARGETARCH debian:bookworm-slim
 
-LABEL       author="David Wolfe (Red-Thirten)" maintainer="rehlmgaming@gmail.com"
+LABEL       author="David Wolfe (Red-Thirten)" maintainer="red_thirten@yahoo.com"
 
-LABEL       org.opencontainers.image.source="https://github.com/parkervcp/yolks"
+LABEL       org.opencontainers.image.source="https://github.com/pelican-eggs/yolks"
 LABEL       org.opencontainers.image.licenses=MIT
 
 ## Update base packages and install dependencies
@@ -17,7 +17,6 @@ RUN         dpkg --add-architecture i386 \
                 iproute2 \
                 gettext-base \
                 ca-certificates \
-                numactl \
                 libssl-dev \
                 lib32gcc-s1 \
                 libsdl2-2.0-0 \
@@ -26,13 +25,20 @@ RUN         dpkg --add-architecture i386 \
                 libstdc++6:i386 \
                 lib32stdc++6 \
                 libcap2 \
-                libnss-wrapper
+                libnss-wrapper \
+                tini
+
+## install rcon client (bercon)
+RUN         cd /tmp/ \
+            && curl -sSL https://github.com/WoozyMasta/bercon/releases/download/1.0.0/bercon > bercon \
+            && mv bercon /usr/local/bin/ \
+            && chmod +x /usr/local/bin/bercon
 
 ## Configure locale
 RUN         update-locale lang=en_US.UTF-8 \
             && dpkg-reconfigure --frontend noninteractive locales
 
-## Prepare NSS Wrapper for the entrypoint as a workaround for Arma 3 requiring a valid UID
+## Prepare NSS Wrapper for the entrypoint as a workaround for DayZ requiring a valid UID
 ENV         NSS_WRAPPER_PASSWD=/tmp/passwd NSS_WRAPPER_GROUP=/tmp/group
 RUN         touch ${NSS_WRAPPER_PASSWD} ${NSS_WRAPPER_GROUP} \
             && chgrp 0 ${NSS_WRAPPER_PASSWD} ${NSS_WRAPPER_GROUP} \
@@ -45,6 +51,10 @@ 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 over and execute entrypoint.sh via Tini
+COPY        --chown=container:container ./entrypoint.sh /entrypoint.sh
+RUN         chmod +x /entrypoint.sh
+ENTRYPOINT  ["/usr/bin/tini", "-g", "--"]
+CMD         ["/entrypoint.sh"]

games/dayz/entrypoint.sh

@@ -1,15 +1,16 @@
 #!/bin/bash
 
-## File: Pterodactyl DayZ SA Image - entrypoint.sh
+## File: DayZ Image - entrypoint.sh
 ## Author: David Wolfe (Red-Thirten)
 ## Contributors: Aussie Server Hosts (https://aussieserverhosts.com/)
-## Date: 2022/11/27
+## Date: 2024/06/05
 ## License: MIT License
 
 ## === CONSTANTS ===
 STEAMCMD_DIR="./steamcmd"                       # SteamCMD's directory containing steamcmd.sh
+WORKSHOP_DIR="./Steam/steamapps/workshop"       # SteamCMD's directory containing workshop downloads
 STEAMCMD_LOG="${STEAMCMD_DIR}/steamcmd.log"     # Log file for SteamCMD
-GAME_ID=221100                                  # SteamCMD ID for the DayZ SA GAME (not server). Only used for Workshop mod downloads.
+GAME_ID=221100                                  # SteamCMD ID for the DayZ GAME (not server). Only used for Workshop mod downloads.
 
 # Color Codes
 CYAN='\033[0;36m'
@@ -45,14 +46,16 @@ function RunSteamCMD { #[Input: int server=0 mod=1; int id]
         
         # Check if updating server or mod
         if [[ $1 == 0 ]]; then # Server
-            numactl --physcpubind=+0 ${STEAMCMD_DIR}/steamcmd.sh +force_install_dir /home/container "+login \"${STEAM_USER}\" \"${STEAM_PASS}\"" +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
-            numactl --physcpubind=+0 ${STEAMCMD_DIR}/steamcmd.sh "+login \"${STEAM_USER}\" \"${STEAM_PASS}\"" +workshop_download_item $GAME_ID $2 +quit | tee -a "${STEAMCMD_LOG}"
+            ${STEAMCMD_DIR}/steamcmd.sh "+login \"${STEAM_USER}\" \"${STEAM_PASS}\"" +workshop_download_item $GAME_ID $2 +quit | tee -a "${STEAMCMD_LOG}"
         fi
         
         # Error checking for SteamCMD
         steamcmdExitCode=${PIPESTATUS[0]}
-        if [[ -n $(grep -i "error\|failed" "${STEAMCMD_LOG}" | grep -iv "setlocal\|SDL\|thread") ]]; then # Catch errors (ignore setlocale, SDL, and thread priority warnings)
+        # Catch errors (ignore setlocale, SDL, steamservice, thread priority, and libcurl warnings)
+        loggedErrors=$(grep -i "error\|failed" "${STEAMCMD_LOG}" | grep -iv "setlocal\|SDL\|steamservice\|thread\|libcurl")
+        if [[ -n ${loggedErrors} ]]; then
             # Soft errors
             if [[ -n $(grep -i "Timeout downloading item" "${STEAMCMD_LOG}") ]]; then # Mod download timeout
                 echo -e "\n${YELLOW}[UPDATE]: ${NC}Timeout downloading Steam Workshop mod: \"${CYAN}${modName}${NC}\" (${CYAN}${2}${NC})"
@@ -104,8 +107,8 @@ function RunSteamCMD { #[Input: int server=0 mod=1; int id]
                 # Move the downloaded mod to the root directory, and replace existing mod if needed
                 mkdir -p ./@$2
                 rm -rf ./@$2/*
-                mv -f ./Steam/steamapps/workshop/content/$GAME_ID/$2/* ./@$2
-                rm -d ./Steam/steamapps/workshop/content/$GAME_ID/$2
+                mv -f ${WORKSHOP_DIR}/content/$GAME_ID/$2/* ./@$2
+                rm -d ${WORKSHOP_DIR}/content/$GAME_ID/$2
                 # Make the mods contents all lowercase
                 ModsLowercase @$2
                 # Move any .bikey's to the keys directory
@@ -238,6 +241,11 @@ if [[ ${UPDATE_SERVER} == 1 ]]; then
                     if [[ -n $latestUpdate ]] && [[ $latestUpdate =~ ^[0-9]+$ ]]; then # Notify last update date, if valid
                         echo -e "\tMod was last updated: ${CYAN}$(date -d @${latestUpdate})${NC}"
                     fi
+                    
+                    # Delete SteamCMD appworkshop cache before running to avoid mod download failures
+                    echo -e "\tClearing SteamCMD appworkshop cache..."
+                    rm -f ${WORKSHOP_DIR}/appworkshop_$GAME_ID.acf
+
                     echo -e "\tAttempting mod update/download via SteamCMD...\n"
                     RunSteamCMD 1 $modID
                 fi
@@ -280,6 +288,6 @@ echo -e "${CYAN}${modifiedStartup}${NC}\n"
 ${modifiedStartup}
 
 if [ $? -ne 0 ]; then
-    echo -e "\n${RED}PTDL_CONTAINER_ERR: There was an error while attempting to run the start command.${NC}\n"
+    echo -e "\n${RED}[STARTUP_ERR]: There was an error while attempting to run the start command.${NC}\n"
     exit 1
 fi

games/minetest/Dockerfile

@@ -0,0 +1,16 @@
+FROM 		--platform=$TARGETOS/$TARGETARCH ubuntu:22.04
+ENV         DEBIAN_FRONTEND noninteractive
+
+RUN         apt update -y \
+			&& apt install -y curl ca-certificates openssl git tar gnupg2 sqlite3 fontconfig tzdata iproute2 libfreetype6 software-properties-common \
+			&& useradd -d /home/container -m container
+
+RUN			add-apt-repository -y ppa:minetestdevs/stable
+RUN			apt update && apt -y install minetest
+
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
+
+COPY        ./entrypoint.sh /entrypoint.sh
+CMD         [ "/bin/bash", "/entrypoint.sh" ]

games/minetest/entrypoint.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# 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-2);exit}')
+export INTERNAL_IP
+
+# Switch to the container's working directory
+cd /home/container || exit 1
+
+# Print minetest version
+printf "\033[1m\033[33mcontainer@pelican~ \033[0mminetest --version\n"
+minetest --version
+
+# Replace Startup Variables
+MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
+echo -e ":/home/container$ ${MODIFIED_STARTUP}"
+
+# Run the Server
+eval ${MODIFIED_STARTUP}

games/mta/Dockerfile

@@ -0,0 +1,23 @@
+FROM  --platform=$TARGETOS/$TARGETARCH ubuntu:20.04
+
+ENV   DEBIAN_FRONTEND noninteractive
+
+## add container user
+RUN   useradd -m -d /home/container -s /bin/bash container
+
+## update base packages
+RUN   apt update \
+        &&   apt upgrade -y
+
+## install dependencies
+RUN   apt install -y iproute2 tar libssl1.1 curl git default-libmysqlclient-dev libmysqlclient-dev libreadline-gplv2-dev libncurses5-dev libncursesw5-dev \ 
+        libtool zip unzip libncurses5 libncursesw5 python3 openssl locales ffmpeg apt-transport-https libc6 binutils xz-utils liblua5.1-0
+
+## 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" ]

games/mta/entrypoint.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+cd /home/container
+
+# Make internal Docker IP address available to processes.
+INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
+export INTERNAL_IP
+
+# Replace Startup Variables
+MODIFIED_STARTUP=$(echo -e $(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g'))
+echo -e ":/home/container$ ${MODIFIED_STARTUP}"
+
+# Run the Server
+eval ${MODIFIED_STARTUP}

games/rust/Dockerfile

@@ -0,0 +1,21 @@
+FROM 		--platform=$TARGETOS/$TARGETARCH node:18-slim
+
+ENV         DEBIAN_FRONTEND=noninteractive
+
+RUN			dpkg --add-architecture i386 \
+			&& apt update \
+			&& apt upgrade -y \
+			&& apt install -y lib32gcc-s1 lib32stdc++6 unzip curl iproute2 tzdata libgdiplus libsdl2-2.0-0:i386 \
+			&& mkdir /wrapper \
+			&& npm install --prefix /wrapper ws \
+			&& useradd -d /home/container -m container
+
+USER 		container
+ENV  		USER=container HOME=/home/container
+
+WORKDIR 	/home/container
+
+COPY 		./entrypoint.sh /entrypoint.sh
+COPY 		./wrapper.js /wrapper/wrapper.js
+
+CMD			[ "/bin/bash", "/entrypoint.sh" ]

games/rust/entrypoint.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+cd /home/container
+
+# Make internal Docker IP address available to processes.
+export INTERNAL_IP=`ip route get 1 | awk '{print $(NF-2);exit}'`
+
+## if auto_update is not set or to 1 update
+if [ -z ${AUTO_UPDATE} ] || [ "${AUTO_UPDATE}" == "1" ]; then
+    # Allow for the staging branch to also update itself
+	./steamcmd/steamcmd.sh +force_install_dir /home/container +login anonymous +app_update 258550 $( [[ -z ${SRCDS_BETAID} ]] || printf %s "-beta ${SRCDS_BETAID}" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s "-betapassword ${SRCDS_BETAPASS}" ) +quit
+else
+    echo -e "Not updating game server as auto update was set to 0. Starting Server"
+fi
+
+# Replace Startup Variables
+MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')`
+echo ":/home/container$ ${MODIFIED_STARTUP}"
+
+if [[ "${FRAMEWORK}" == "carbon" ]]; then
+    # Carbon: https://github.com/CarbonCommunity/Carbon
+    echo "Updating Carbon..."
+    curl -sSL "https://github.com/CarbonCommunity/Carbon/releases/download/production_build/Carbon.Linux.Release.tar.gz" | tar zx
+    echo "Done updating Carbon!"
+
+    export DOORSTOP_ENABLED=1
+    export DOORSTOP_TARGET_ASSEMBLY="$(pwd)/carbon/managed/Carbon.Preloader.dll"
+    MODIFIED_STARTUP="LD_PRELOAD=$(pwd)/libdoorstop.so ${MODIFIED_STARTUP}"
+elif [[ "${FRAMEWORK}" == "oxide-staging" ]]; then
+    echo "updating oxide-staging"
+    curl -sSL -o oxide-staging.zip "https://downloads.oxidemod.com/artifacts/Oxide.Rust/staging/Oxide.Rust-linux.zip"
+    unzip -o -q oxide-staging.zip
+    rm oxide-staging.zip
+    echo "Done updating oxide Staging"
+elif [[ "$OXIDE" == "1" ]] || [[ "${FRAMEWORK}" == "oxide" ]]; then
+    # Oxide: https://github.com/OxideMod/Oxide.Rust
+    echo "Updating uMod..."
+    curl -sSL "https://github.com/OxideMod/Oxide.Rust/releases/latest/download/Oxide.Rust-linux.zip" > umod.zip
+    unzip -o -q umod.zip
+    rm umod.zip
+    echo "Done updating uMod!"
+# else Vanilla, do nothing
+fi
+
+# Fix for Rust not starting
+export LD_LIBRARY_PATH=$(pwd)/RustDedicated_Data/Plugins/x86_64:$(pwd)
+
+# Run the Server
+/wrapper/wrapper.js "${MODIFIED_STARTUP}"

games/rust/wrapper.js

@@ -0,0 +1,140 @@
+#!/usr/bin/env node
+
+var startupCmd = "";
+const fs = require("fs");
+fs.writeFile("latest.log", "", (err) => {
+	if (err) console.log("Callback error in appendFile:" + err);
+});
+
+var args = process.argv.splice(process.execArgv.length + 2);
+for (var i = 0; i < args.length; i++) {
+	if (i === args.length - 1) {
+		startupCmd += args[i];
+	} else {
+		startupCmd += args[i] + " ";
+	}
+}
+
+if (startupCmd.length < 1) {
+	console.log("Error: Please specify a startup command.");
+	process.exit();
+}
+
+const seenPercentage = {};
+
+function filter(data) {
+	const str = data.toString();
+	if (str.startsWith("Loading Prefab Bundle ")) { // Rust seems to spam the same percentage, so filter out any duplicates.
+		const percentage = str.substr("Loading Prefab Bundle ".length);
+		if (seenPercentage[percentage]) return;
+
+		seenPercentage[percentage] = true;
+	}
+
+	console.log(str);
+}
+
+var exec = require("child_process").exec;
+console.log("Starting Rust...");
+
+var exited = false;
+const gameProcess = exec(startupCmd);
+gameProcess.stdout.on('data', filter);
+gameProcess.stderr.on('data', filter);
+gameProcess.on('exit', function (code, signal) {
+	exited = true;
+
+	if (code) {
+		console.log("Main game process exited with code " + code);
+		// process.exit(code);
+	}
+});
+
+function initialListener(data) {
+	const command = data.toString().trim();
+	if (command === 'quit') {
+		gameProcess.kill('SIGTERM');
+	} else {
+		console.log('Unable to run "' + command + '" due to RCON not being connected yet.');
+	}
+}
+process.stdin.resume();
+process.stdin.setEncoding("utf8");
+process.stdin.on('data', initialListener);
+
+process.on('exit', function (code) {
+	if (exited) return;
+
+	console.log("Received request to stop the process, stopping the game...");
+	gameProcess.kill('SIGTERM');
+});
+
+var waiting = true;
+var poll = function () {
+	function createPacket(command) {
+		var packet = {
+			Identifier: -1,
+			Message: command,
+			Name: "WebRcon"
+		};
+		return JSON.stringify(packet);
+	}
+
+	var serverHostname = process.env.RCON_IP ? process.env.RCON_IP : "localhost";
+	var serverPort = process.env.RCON_PORT;
+	var serverPassword = process.env.RCON_PASS;
+	var WebSocket = require("ws");
+	var ws = new WebSocket("ws://" + serverHostname + ":" + serverPort + "/" + serverPassword);
+
+	ws.on("open", function open() {
+		console.log("Connected to RCON. Generating the map now. Please wait until the server status switches to \"Running\".");
+		waiting = false;
+
+		// Hack to fix broken console output
+		ws.send(createPacket('status'));
+
+		process.stdin.removeListener('data', initialListener);
+		gameProcess.stdout.removeListener('data', filter);
+		gameProcess.stderr.removeListener('data', filter);
+		process.stdin.on('data', function (text) {
+			ws.send(createPacket(text));
+		});
+	});
+
+	ws.on("message", function (data, flags) {
+		try {
+			var json = JSON.parse(data);
+			if (json !== undefined) {
+				if (json.Message !== undefined && json.Message.length > 0) {
+					console.log(json.Message);
+					const fs = require("fs");
+					fs.appendFile("latest.log", "\n" + json.Message, (err) => {
+						if (err) console.log("Callback error in appendFile:" + err);
+					});
+				}
+			} else {
+				console.log("Error: Invalid JSON received");
+			}
+		} catch (e) {
+			if (e) {
+				console.log(e);
+			}
+		}
+	});
+
+	ws.on("error", function (err) {
+		waiting = true;
+		console.log("Waiting for RCON to come up...");
+		setTimeout(poll, 5000);
+	});
+
+	ws.on("close", function () {
+		if (!waiting) {
+			console.log("Connection to server closed.");
+
+			exited = true;
+			process.exit();
+		}
+	});
+}
+poll();

games/samp/Dockerfile

@@ -1,4 +1,4 @@
-FROM        --platform=$TARGETOS/$TARGETARCH debian:bullseye-slim
+FROM        --platform=$TARGETOS/$TARGETARCH debian:bookworm-slim
 
 LABEL       author="QuintenQVD" maintainer="josdekurk@gmail.com"
 
@@ -7,17 +7,27 @@ RUN         apt update \
 RUN         dpkg --add-architecture i386 \
             && apt update \
             && apt upgrade -y \
-            && apt install -y libstdc++6 lib32stdc++6 tar curl iproute2 openssl fontconfig dirmngr ca-certificates dnsutils tzdata zip  \
-            && apt install -y libtbb2:i386 libtbb-dev:i386 libicu-dev:i386  \
+            && apt install -y libstdc++6 lib32stdc++6 tar wget curl iproute2 openssl fontconfig dirmngr ca-certificates dnsutils tzdata zip tini \
+            && apt install -y libtbb12:i386 libtbb-dev:i386 libicu-dev:i386  \
             && useradd -d /home/container -m container
 
 RUN         mkdir -p /run/systemd && echo 'docker' > /run/systemd/container
 RUN         rm -rf /var/lib/apt/lists/*
 
-
+            # Temp fix for things that still need libssl1.1 32 bit
+RUN         if [ "$(uname -m)" = "x86_64" ]; then \
+                wget http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.0g-2ubuntu4_i386.deb && \
+                dpkg -i libssl1.1_1.1.0g-2ubuntu4_i386.deb && \
+                rm libssl1.1_1.1.0g-2ubuntu4_i386.deb; \
+            fi
+			
 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"]

games/source/Dockerfile

@@ -20,7 +20,7 @@
 # SOFTWARE.
 #
 
-FROM        --platform=$TARGETOS/$TARGETARCH debian:stable-slim
+FROM        --platform=$TARGETOS/$TARGETARCH debian:bookworm-slim
 
 LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"
 
@@ -32,18 +32,29 @@ 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 numactl \
+            && apt install -y tar curl gcc g++ lib32gcc-s1 libgcc-11-dev libgcc-12-dev libcurl4-gnutls-dev:i386 libssl-dev: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-traditional tzdata numactl wget tini \
             && useradd -m -d /home/container container
 
 ## install rcon
 RUN         cd /tmp/ \
-            && curl -sSL https://github.com/gorcon/rcon-cli/releases/download/v0.10.2/rcon-0.10.2-amd64_linux.tar.gz > rcon.tar.gz \
+            && curl -sSL https://github.com/gorcon/rcon-cli/releases/download/v0.10.3/rcon-0.10.3-amd64_linux.tar.gz > rcon.tar.gz \
             && tar xvf rcon.tar.gz \
-            && mv rcon-0.10.2-amd64_linux/rcon /usr/local/bin/
+            && mv rcon-0.10.3-amd64_linux/rcon /usr/local/bin/
 
+        # Temp fix for things that still need libssl1.1
+RUN     if [ "$(uname -m)" = "x86_64" ]; then \
+            wget http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.0g-2ubuntu4_amd64.deb && \
+            dpkg -i libssl1.1_1.1.0g-2ubuntu4_amd64.deb && \
+            rm libssl1.1_1.1.0g-2ubuntu4_amd64.deb; \
+        fi
+        
 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"]

games/source/entrypoint.sh

@@ -53,9 +53,9 @@ if [ -z ${AUTO_UPDATE} ] || [ "${AUTO_UPDATE}" == "1" ]; then
     # Update Source Server
     if [ ! -z ${SRCDS_APPID} ]; then
 	    if [ "${STEAM_USER}" == "anonymous" ]; then
-            ./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
+            ./steamcmd/steamcmd.sh +force_install_dir /home/container +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ "${WINDOWS_INSTALL}" == "1" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update 1007 +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
-            numactl --physcpubind=+0 ./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
+            numactl --physcpubind=+0 ./steamcmd/steamcmd.sh +force_install_dir /home/container +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ "${WINDOWS_INSTALL}" == "1" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update 1007 +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
 	    fi
     else
         echo -e "No appid set. Starting Server"

games/thebattleforwesnoth/Dockerfile

@@ -0,0 +1,25 @@
+FROM        --platform=$TARGETOS/$TARGETARCH debian:bookworm-slim
+
+LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
+
+## update base packages
+RUN apt update && apt upgrade -y
+
+## install dependencies
+RUN   apt install -y gcc g++ libgcc1 libc++-dev gdb libc6 git tar zip unzip libssl-dev tini iproute2 \ 
+      libboost-filesystem-dev libboost-iostreams-dev libboost-locale-dev libboost-random-dev libboost-regex-dev libboost-program-options-dev libboost-system-dev libboost-coroutine-dev libboost-graph-dev \
+      libsdl2-dev libcurl4-openssl-dev libcairo2-dev libvorbis-dev libbz2-dev zlib1g-dev libssl-dev libcrypto++-dev openssl cmake libsdl2-image-dev libsdl2-mixer-dev libsdl-pango-dev
+
+
+## add container user
+RUN   useradd -m -d /home/container -s /bin/bash container
+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"]

games/thebattleforwesnoth/entrypoint.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+cd /home/container
+
+# Make internal Docker IP address available to processes.
+INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
+export INTERNAL_IP
+
+# Replace Startup Variables
+MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
+echo -e ":/home/container$ ${MODIFIED_STARTUP}"
+
+# Run the Server
+eval ${MODIFIED_STARTUP}

games/valheim/Dockerfile

@@ -14,7 +14,7 @@ RUN         dpkg --add-architecture i386 \
             && 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
+        		libfontconfig locales libcurl3-gnutls libpulse-dev libpulse0 libnss-wrapper gettext tini
 
 ## configure locale
 RUN   update-locale lang=en_US.UTF-8 \
@@ -34,5 +34,9 @@ RUN         touch ${NSS_WRAPPER_PASSWD} ${NSS_WRAPPER_GROUP} \
 ADD         passwd.template /passwd.template
 
 
-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"]

games/valheim/entrypoint.sh

@@ -21,7 +21,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} $( [[ "${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
+        ./steamcmd/steamcmd.sh +force_install_dir /home/container +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ "${WINDOWS_INSTALL}" == "1" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update 1007 +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

go/1.20/Dockerfile

@@ -0,0 +1,38 @@
+#
+# 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=$TARGETOS/$TARGETARCH golang:1.20-alpine
+
+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 tzdata \
+				&& 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" ]

go/1.21/Dockerfile

@@ -0,0 +1,38 @@
+#
+# 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=$TARGETOS/$TARGETARCH golang:1.21-alpine
+
+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 tzdata \
+				&& 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" ]

go/1.22/Dockerfile

@@ -0,0 +1,38 @@
+#
+# 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=$TARGETOS/$TARGETARCH golang:1.22-alpine
+
+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 tzdata \
+				&& 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" ]

go/1.23/Dockerfile

@@ -0,0 +1,12 @@
+FROM        --platform=$TARGETOS/$TARGETARCH golang:1.23-alpine
+
+
+RUN         apk add --update --no-cache ca-certificates tzdata \
+				&& 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" ]

go/entrypoint.sh

@@ -34,16 +34,16 @@ export INTERNAL_IP
 cd /home/container || exit 1
 
 # Print Go version
-printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0mgo version\n"
+printf "\033[1m\033[33mcontainer@pelican~ \033[0mgo version\n"
 go version
 
 # 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 -)")
+PARSED=$(echo "$STARTUP" | sed -e 's/{{/${/g' -e 's/}}/}/g')
 
-# 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"
+# Display the command we're running in the output, and then execute it with eval
+printf "\033[1m\033[33mcontainer@pelican~ \033[0m"
+echo "$PARSED"
 # shellcheck disable=SC2086
-exec env ${PARSED}
+eval "$PARSED"

installers/debian/Dockerfile

@@ -20,7 +20,7 @@
 # SOFTWARE.
 #
 
-FROM        --platform=$TARGETOS/$TARGETARCH debian:stable-slim
+FROM        --platform=$TARGETOS/$TARGETARCH debian:bookworm-slim
 
 LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"
 
@@ -29,7 +29,12 @@ LABEL       org.opencontainers.image.licenses=MIT
 
 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 unzip zip tar jq
+RUN      apt update && apt upgrade -y \
+         && apt -y --no-install-recommends install ca-certificates curl git unzip zip tar jq wget
+
+# Only install the needed steamcmd packages on the AMD64 build
+RUN         if [ "$(uname -m)" = "x86_64" ]; then \
+                dpkg --add-architecture i386 && \
+                apt update && \
+                apt -y install lib32gcc-s1 libsdl2-2.0-0:i386; \
+            fi

installers/ubuntu/Dockerfile

@@ -20,7 +20,7 @@
 # SOFTWARE.
 #
 
-FROM        --platform=$TARGETOS/$TARGETARCH ubuntu:focal
+FROM        --platform=$TARGETOS/$TARGETARCH ubuntu:jammy
 
 LABEL       author="oliver194" maintainer="100048880+oliver194@users.noreply.github.com"
 

java/11/Dockerfile

@@ -1,4 +1,4 @@
-FROM        --platform=$TARGETOS/$TARGETARCH openjdk:11-slim
+FROM        --platform=$TARGETOS/$TARGETARCH eclipse-temurin:11.0.13_8-jdk-focal
 
 LABEL       author="Michael Parker" maintainer="parker@pterodactyl.io"
 
@@ -6,12 +6,32 @@ LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolk
 LABEL       org.opencontainers.image.licenses=MIT
 
 RUN         apt update -y \
-						&& apt install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \
-						&& useradd -d /home/container -m container
+            && apt install -y \
+                curl \
+                lsof \
+                ca-certificates \
+                openssl \
+                git \
+                tar \
+                sqlite3 \
+                fontconfig \
+                tzdata \
+                iproute2 \
+                libfreetype6 \
+                tini \
+				zip \
+				unzip
 
+
+## Setup user and working directory
+RUN         useradd -m -d /home/container -s /bin/bash container
 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"]

java/11j9/Dockerfile

@@ -1,16 +1,33 @@
-FROM        --platform=$TARGETOS/$TARGETARCH adoptopenjdk/openjdk11-openj9:debianslim
+FROM        --platform=$TARGETOS/$TARGETARCH ibm-semeru-runtimes:open-11-jdk
 
 LABEL       author="Michael Parker" maintainer="parker@pterodactyl.io"
 
 RUN         apt update -y \
-						&& apt install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \
-						&& useradd -d /home/container -m container
+            && apt install -y \
+                curl \
+                lsof \
+                ca-certificates \
+                openssl \
+                git \
+                tar \
+                sqlite3 \
+                fontconfig \
+                tzdata \
+                iproute2 \
+                libfreetype6 \
+                tini \
+				zip \
+				unzip
 
+## Setup user and working directory
+RUN         useradd -m -d /home/container -s /bin/bash container
 USER        container
 ENV         USER=container HOME=/home/container
-
 WORKDIR     /home/container
 
-COPY        ./entrypoint.sh /entrypoint.sh
+STOPSIGNAL SIGINT
 
-CMD         ["/bin/bash", "/entrypoint.sh"]
+COPY        --chown=container:container ./../entrypoint.sh /entrypoint.sh
+RUN         chmod +x /entrypoint.sh
+ENTRYPOINT    ["/usr/bin/tini", "-g", "--"]
+CMD         ["/entrypoint.sh"]

java/16/Dockerfile

@@ -1,4 +1,4 @@
-FROM        --platform=$TARGETOS/$TARGETARCH openjdk:16-slim
+FROM        --platform=$TARGETOS/$TARGETARCH eclipse-temurin:16-jdk-focal
 
 LABEL       author="Michael Parker" maintainer="parker@pterodactyl.io"
 
@@ -6,12 +6,31 @@ LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolk
 LABEL       org.opencontainers.image.licenses=MIT
 
 RUN         apt update -y \
-						&& apt install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \
-						&& useradd -d /home/container -m container
+            && apt install -y \
+                curl \
+                lsof \
+                ca-certificates \
+                openssl \
+                git \
+                tar \
+                sqlite3 \
+                fontconfig \
+                tzdata \
+                iproute2 \
+                libfreetype6 \
+                tini \
+				zip \
+				unzip
 
+## Setup user and working directory
+RUN         useradd -m -d /home/container -s /bin/bash container
 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"]

java/16j9/Dockerfile

@@ -1,16 +1,34 @@
-FROM        --platform=$TARGETOS/$TARGETARCH adoptopenjdk/openjdk16-openj9:debianslim
+FROM        --platform=$TARGETOS/$TARGETARCH ibm-semeru-runtimes:open-16-jdk
 
 LABEL       author="Michael Parker" maintainer="parker@pterodactyl.io"
 
 RUN         apt update -y \
-						&& apt install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \
-						&& useradd -d /home/container -m container
+            && apt install -y \
+                curl \
+                lsof \
+                ca-certificates \
+                openssl \
+                git \
+                tar \
+                sqlite3 \
+                fontconfig \
+                tzdata \
+                iproute2 \
+                libfreetype6 \
+                tini \
+				zip \
+				unzip
 
+## Setup user and working directory
+RUN         useradd -m -d /home/container -s /bin/bash container
 USER        container
 ENV         USER=container HOME=/home/container
-
 WORKDIR     /home/container
 
-COPY        ./entrypoint.sh /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"]
 
-CMD         ["/bin/bash", "/entrypoint.sh"]

java/17/Dockerfile

@@ -1,4 +1,4 @@
-FROM        --platform=$TARGETOS/$TARGETARCH openjdk:17-slim
+FROM        --platform=$TARGETOS/$TARGETARCH eclipse-temurin:17-jdk-jammy
 
 LABEL       author="Michael Parker" maintainer="parker@pterodactyl.io"
 
@@ -6,12 +6,31 @@ LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolk
 LABEL       org.opencontainers.image.licenses=MIT
 
 RUN         apt update -y \
-						&& apt install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \
-						&& useradd -d /home/container -m container
+            && apt install -y \
+                curl \
+                lsof \
+                ca-certificates \
+                openssl \
+                git \
+                tar \
+                sqlite3 \
+                fontconfig \
+                tzdata \
+                iproute2 \
+                libfreetype6 \
+                tini \
+				zip \
+				unzip
 
+## Setup user and working directory
+RUN         useradd -m -d /home/container -s /bin/bash container
 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"]

java/19/Dockerfile

@@ -1,4 +1,4 @@
-FROM        --platform=$TARGETOS/$TARGETARCH openjdk:19-slim
+FROM        --platform=$TARGETOS/$TARGETARCH eclipse-temurin:19-jdk-jammy
 
 LABEL       author="Michael Parker" maintainer="parker@pterodactyl.io"
 
@@ -6,12 +6,31 @@ LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolk
 LABEL       org.opencontainers.image.licenses=MIT
 
 RUN         apt update -y \
-						&& apt install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \
-						&& useradd -d /home/container -m container
+            && apt install -y \
+                curl \
+                lsof \
+                ca-certificates \
+                openssl \
+                git \
+                tar \
+                sqlite3 \
+                fontconfig \
+                tzdata \
+                iproute2 \
+                libfreetype6 \
+                tini \
+				zip \
+				unzip
 
+## Setup user and working directory
+RUN         useradd -m -d /home/container -s /bin/bash container
 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"]

java/21/Dockerfile

@@ -0,0 +1,36 @@
+FROM        --platform=$TARGETOS/$TARGETARCH eclipse-temurin:21-jdk-jammy
+
+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 update -y \
+            && apt install -y \
+                curl \
+                lsof \
+                ca-certificates \
+                openssl \
+                git \
+                tar \
+                sqlite3 \
+                fontconfig \
+                tzdata \
+                iproute2 \
+                libfreetype6 \
+                tini \
+				zip \
+				unzip
+
+## Setup user and working directory
+RUN         useradd -m -d /home/container -s /bin/bash container
+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"]

java/8/Dockerfile

@@ -1,4 +1,4 @@
-FROM        --platform=$TARGETOS/$TARGETARCH openjdk:8-slim-buster
+FROM        --platform=$TARGETOS/$TARGETARCH eclipse-temurin:8u312-b07-jdk-focal
 
 LABEL       author="Michael Parker" maintainer="parker@pterodactyl.io"
 
@@ -6,12 +6,31 @@ LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolk
 LABEL       org.opencontainers.image.licenses=MIT
 
 RUN         apt update -y \
-						&& apt install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \
-						&& useradd -d /home/container -m container
+            && apt install -y \
+                curl \
+                lsof \
+                ca-certificates \
+                openssl \
+                git \
+                tar \
+                sqlite3 \
+                fontconfig \
+                tzdata \
+                iproute2 \
+                libfreetype6 \
+                tini \
+				zip \
+				unzip
 
+## Setup user and working directory
+RUN         useradd -m -d /home/container -s /bin/bash container
 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"]

java/8j9/Dockerfile

@@ -1,16 +1,33 @@
-FROM        --platform=$TARGETOS/$TARGETARCH adoptopenjdk/openjdk8-openj9:debianslim
+FROM        --platform=$TARGETOS/$TARGETARCH ibm-semeru-runtimes:open-8-jdk
 
 LABEL       author="Michael Parker" maintainer="parker@pterodactyl.io"
 
 RUN         apt update -y \
-						&& apt install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 libfreetype6 \
-						&& useradd -d /home/container -m container
+            && apt install -y \
+                curl \
+                lsof \
+                ca-certificates \
+                openssl \
+                git \
+                tar \
+                sqlite3 \
+                fontconfig \
+                tzdata \
+                iproute2 \
+                libfreetype6 \
+                tini \
+				zip \
+				unzip
 
+## Setup user and working directory
+RUN         useradd -m -d /home/container -s /bin/bash container
 USER        container
 ENV         USER=container HOME=/home/container
-
 WORKDIR     /home/container
 
-COPY        ./entrypoint.sh /entrypoint.sh
+STOPSIGNAL SIGINT
 
-CMD         ["/bin/bash", "/entrypoint.sh"]
+COPY        --chown=container:container ./../entrypoint.sh /entrypoint.sh
+RUN         chmod +x /entrypoint.sh
+ENTRYPOINT    ["/usr/bin/tini", "-g", "--"]
+CMD         ["/entrypoint.sh"]

java/entrypoint.sh

@@ -34,16 +34,16 @@ export INTERNAL_IP
 cd /home/container || exit 1
 
 # Print Java version
-printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0mjava -version\n"
+printf "\033[1m\033[33mcontainer@pelican~ \033[0mjava -version\n"
 java -version
 
 # 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 -)")
+PARSED=$(echo "$STARTUP" | sed -e 's/{{/${/g' -e 's/}}/}/g')
 
-# 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"
+# Display the command we're running in the output, and then execute it with eval
+printf "\033[1m\033[33mcontainer@pelican~ \033[0m"
+echo "$PARSED"
 # shellcheck disable=SC2086
-eval ${PARSED}
+eval "$PARSED"