diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..07764a7
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+* text eol=lf
\ No newline at end of file
diff --git a/.github/workflows/box64.yml b/.github/workflows/box64.yml
index d945032..906614d 100644
--- a/.github/workflows/box64.yml
+++ b/.github/workflows/box64.yml
@@ -1,39 +1,39 @@
-name: build box64
-on:
- workflow_dispatch:
- schedule:
- - cron: "0 0 * * 1"
- push:
- branches:
- - master
- paths:
- - box64/**
-jobs:
- push:
- name: "yolks:${{ matrix.tag }}"
- runs-on: ubuntu-latest
- strategy:
- fail-fast: false
- matrix:
- tag:
- - box64
- 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@v6
- 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 }}
+name: build box64
+on:
+ workflow_dispatch:
+ schedule:
+ - cron: "0 0 * * 1"
+ push:
+ branches:
+ - master
+ paths:
+ - box64/**
+jobs:
+ push:
+ name: "yolks:${{ matrix.tag }}"
+ runs-on: ubuntu-latest
+ strategy:
+ fail-fast: false
+ matrix:
+ tag:
+ - box64
+ 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@v6
+ 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 }}
diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
index 9f2f027..cc12c34 100644
--- a/.github/workflows/dart.yml
+++ b/.github/workflows/dart.yml
@@ -1,44 +1,44 @@
-name: build dart
-on:
- workflow_dispatch:
- schedule:
- - cron: "0 0 * * 1"
- push:
- branches:
- - master
- paths:
- - dart/**
-jobs:
- push:
- name: "yolks:dart_${{ matrix.tag }}"
- runs-on: ubuntu-latest
- strategy:
- fail-fast: false
- matrix:
- tag:
- - '2.17'
- - '2.18'
- - '2.19'
- - '3.3'
- - 'stable'
- steps:
- - 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@v3
- with:
- registry: ghcr.io
- username: ${{ github.repository_owner }}
- password: ${{ secrets.REGISTRY_TOKEN }}
- - uses: docker/build-push-action@v6
- 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 }}
+name: build dart
+on:
+ workflow_dispatch:
+ schedule:
+ - cron: "0 0 * * 1"
+ push:
+ branches:
+ - master
+ paths:
+ - dart/**
+jobs:
+ push:
+ name: "yolks:dart_${{ matrix.tag }}"
+ runs-on: ubuntu-latest
+ strategy:
+ fail-fast: false
+ matrix:
+ tag:
+ - '2.17'
+ - '2.18'
+ - '2.19'
+ - '3.3'
+ - 'stable'
+ steps:
+ - 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@v3
+ with:
+ registry: ghcr.io
+ username: ${{ github.repository_owner }}
+ password: ${{ secrets.REGISTRY_TOKEN }}
+ - uses: docker/build-push-action@v6
+ 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 }}
diff --git a/dart/2.17/Dockerfile b/dart/2.17/Dockerfile
index ef05342..a40a497 100644
--- a/dart/2.17/Dockerfile
+++ b/dart/2.17/Dockerfile
@@ -1,18 +1,18 @@
-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 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"]
+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 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"]
diff --git a/dart/2.18/Dockerfile b/dart/2.18/Dockerfile
index eda747a..e8955f6 100644
--- a/dart/2.18/Dockerfile
+++ b/dart/2.18/Dockerfile
@@ -1,18 +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"]
+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"]
diff --git a/dart/2.19/Dockerfile b/dart/2.19/Dockerfile
index c01b351..cb94aa0 100644
--- a/dart/2.19/Dockerfile
+++ b/dart/2.19/Dockerfile
@@ -1,18 +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"]
+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"]
diff --git a/dotnet/7/Dockerfile b/dotnet/7/Dockerfile
index 985601f..5358efc 100644
--- a/dotnet/7/Dockerfile
+++ b/dotnet/7/Dockerfile
@@ -1,25 +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/7.0 | grep -i '
SDK 7.*.*
' | 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"]
+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 'SDK 7.*.*
' | head -1 | awk -F\" '{print $3}' | awk '{print $2;}' | sed 's/<\/h3>//g')" \
+ && chmod +x dotnet-install.sh \
+ && ./dotnet-install.sh -i /usr/share -v $D_V \
+ && ln -s /usr/share/dotnet /usr/bin/dotnet
+
+USER container
+ENV USER=container HOME=/home/container
+WORKDIR /home/container
+
+STOPSIGNAL SIGINT
+
+COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
+CMD ["/entrypoint.sh"]
diff --git a/dotnet/9/Dockerfile b/dotnet/9/Dockerfile
index 3fd591e..640c27f 100644
--- a/dotnet/9/Dockerfile
+++ b/dotnet/9/Dockerfile
@@ -1,25 +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 'SDK 9.*.*
' | 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"]
+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 'SDK 9.*.*
' | head -1 | awk -F\" '{print $3}' | awk '{print $2;}' | sed 's/<\/h3>//g')" \
+ && chmod +x dotnet-install.sh \
+ && ./dotnet-install.sh -i /usr/share -v $D_V \
+ && ln -s /usr/share/dotnet /usr/bin/dotnet
+
+USER container
+ENV USER=container HOME=/home/container
+WORKDIR /home/container
+
+STOPSIGNAL SIGINT
+
+COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
+CMD ["/entrypoint.sh"]
diff --git a/erlang/25/Dockerfile b/erlang/25/Dockerfile
index 8248b86..4f67d32 100644
--- a/erlang/25/Dockerfile
+++ b/erlang/25/Dockerfile
@@ -1,16 +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" ]
+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" ]
diff --git a/erlang/26/Dockerfile b/erlang/26/Dockerfile
index f806048..2557687 100644
--- a/erlang/26/Dockerfile
+++ b/erlang/26/Dockerfile
@@ -1,16 +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" ]
+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" ]
diff --git a/games/minetest/Dockerfile b/games/minetest/Dockerfile
index 5f5c4f8..8f75208 100644
--- a/games/minetest/Dockerfile
+++ b/games/minetest/Dockerfile
@@ -1,16 +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
+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" ]
\ No newline at end of file
diff --git a/games/mta/Dockerfile b/games/mta/Dockerfile
index 28074a2..509fdd8 100644
--- a/games/mta/Dockerfile
+++ b/games/mta/Dockerfile
@@ -1,23 +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
+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" ]
\ No newline at end of file
diff --git a/games/samp/Dockerfile b/games/samp/Dockerfile
index ba6198a..33f6dce 100644
--- a/games/samp/Dockerfile
+++ b/games/samp/Dockerfile
@@ -1,33 +1,33 @@
-FROM --platform=$TARGETOS/$TARGETARCH debian:bookworm-slim
-
-LABEL author="QuintenQVD" maintainer="josdekurk@gmail.com"
-
-RUN apt update \
- && apt -y upgrade
-RUN dpkg --add-architecture i386 \
- && apt update \
- && apt upgrade -y \
- && 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
-
-STOPSIGNAL SIGINT
-
-COPY --chown=container:container ./entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
-ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
-CMD ["/entrypoint.sh"]
+FROM --platform=$TARGETOS/$TARGETARCH debian:bookworm-slim
+
+LABEL author="QuintenQVD" maintainer="josdekurk@gmail.com"
+
+RUN apt update \
+ && apt -y upgrade
+RUN dpkg --add-architecture i386 \
+ && apt update \
+ && apt upgrade -y \
+ && 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
+
+STOPSIGNAL SIGINT
+
+COPY --chown=container:container ./entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
+CMD ["/entrypoint.sh"]
diff --git a/go/1.22/Dockerfile b/go/1.22/Dockerfile
index 0473172..a6c7d15 100644
--- a/go/1.22/Dockerfile
+++ b/go/1.22/Dockerfile
@@ -1,38 +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" ]
+#
+# 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" ]
diff --git a/go/1.23/Dockerfile b/go/1.23/Dockerfile
index 82d2f74..df237ca 100644
--- a/go/1.23/Dockerfile
+++ b/go/1.23/Dockerfile
@@ -1,12 +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" ]
+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" ]
diff --git a/java/21/Dockerfile b/java/21/Dockerfile
index a0e4f26..d90944a 100644
--- a/java/21/Dockerfile
+++ b/java/21/Dockerfile
@@ -1,36 +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"]
+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"]
diff --git a/nodejs/22/Dockerfile b/nodejs/22/Dockerfile
index 6a45907..0ae0985 100644
--- a/nodejs/22/Dockerfile
+++ b/nodejs/22/Dockerfile
@@ -1,25 +1,25 @@
-FROM --platform=$TARGETOS/$TARGETARCH node:22-bookworm-slim
-
-LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
-
-RUN apt update \
- && apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential libtool iputils-ping libnss3 tini \
- && useradd -m -d /home/container container
-
- RUN npm install npm@latest typescript ts-node @types/node --location=global
-
-# install pnpm
-RUN npm install -g corepack
-RUN corepack enable
-RUN corepack prepare pnpm@latest --activate
-
-USER container
-ENV USER=container HOME=/home/container
-WORKDIR /home/container
-
-STOPSIGNAL SIGINT
-
-COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
-ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
-CMD ["/entrypoint.sh"]
+FROM --platform=$TARGETOS/$TARGETARCH node:22-bookworm-slim
+
+LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
+
+RUN apt update \
+ && apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential libtool iputils-ping libnss3 tini \
+ && useradd -m -d /home/container container
+
+ RUN npm install npm@latest typescript ts-node @types/node --location=global
+
+# install pnpm
+RUN npm install -g corepack
+RUN corepack enable
+RUN corepack prepare pnpm@latest --activate
+
+USER container
+ENV USER=container HOME=/home/container
+WORKDIR /home/container
+
+STOPSIGNAL SIGINT
+
+COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
+CMD ["/entrypoint.sh"]