Merge branch 'master' into tini

pelican-eggs · Sep 6, 2023 · 94aa88b · 94aa88b
2 parents baf2724 + 02aad51
commit 94aa88b
Show file tree

Hide file tree

Showing 27 changed files with 335 additions and 99 deletions.
diff --git a/.github/workflows/bun.yml b/.github/workflows/bun.yml
@@ -0,0 +1,39 @@
+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@v3
+      - uses: docker/setup-qemu-action@v2
+      - uses: docker/setup-buildx-action@v2
+        with:
+          buildkitd-flags: --debug
+      - uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.REGISTRY_TOKEN }}
+      - uses: docker/build-push-action@v4
+        with:
+          context: ./bun
+          file: ./bun/${{ matrix.tag }}/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            ghcr.io/parkervcp/yolks:bun_${{ matrix.tag }}
diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml
@@ -21,6 +21,7 @@ jobs:
           - ubuntu
     steps:
       - uses: actions/checkout@v3
+      - uses: docker/setup-qemu-action@v2
       - uses: docker/setup-buildx-action@v2
         with:
           buildkitd-flags: --debug
@@ -33,7 +34,7 @@ jobs:
         with:
           context: ./installers
           file: ./installers/${{ matrix.tag }}/Dockerfile
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: |
             ghcr.io/parkervcp/installers:${{ matrix.tag }}
diff --git a/.github/workflows/wine.yml b/.github/workflows/wine.yml
@@ -17,6 +17,7 @@ jobs:
       matrix:
         tag:
           - latest
+          - devel
           - staging
     steps:
       - uses: actions/checkout@v3

diff --git a/README.md b/README.md
@@ -51,6 +51,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)
@@ -176,6 +183,7 @@ is tagged correctly.
 * [`node20`](/nodejs/20)
   * `ghcr.io/parkervcp/yolks:nodejs_20`
 
+
 ### [PostgreSQL](/postgres)
 
   * [`Postgres 9`](/postgres/9)
@@ -244,6 +252,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)

diff --git a/bun/canary/Dockerfile b/bun/canary/Dockerfile
@@ -0,0 +1,17 @@
+FROM   --platform=$TARGETOS/$TARGETARCH oven/bun:canary
+
+LABEL author="MrAtox" maintainer="[email protected]"
+
+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 \
+            && useradd -m -d /home/container container
+
+RUN bun upgrade
+
+USER container
+ENV USER=container HOME=/home/container
+WORKDIR /home/container
+
+ENTRYPOINT []
+COPY        ./../entrypoint.sh /entrypoint.sh
+CMD         [ "/bin/bash", "/entrypoint.sh" ]
diff --git a/bun/entrypoint.sh b/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}
diff --git a/bun/latest/Dockerfile b/bun/latest/Dockerfile
@@ -0,0 +1,17 @@
+FROM   --platform=$TARGETOS/$TARGETARCH oven/bun:latest
+
+LABEL author="MrAtox" maintainer="[email protected]"
+
+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 \
+            && useradd -m -d /home/container container
+
+RUN bun upgrade
+
+USER container
+ENV USER=container HOME=/home/container
+WORKDIR /home/container
+
+ENTRYPOINT []
+COPY        ./../entrypoint.sh /entrypoint.sh
+CMD          [ "/bin/bash", "/entrypoint.sh" ]
diff --git a/installers/debian/Dockerfile b/installers/debian/Dockerfile
@@ -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 wget
+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
diff --git a/java/11/Dockerfile b/java/11/Dockerfile
@@ -6,9 +6,23 @@ LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolk
 LABEL       org.opencontainers.image.licenses=MIT
 
 RUN         apt update -y \
-						&& apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 tini \
-						&& useradd -d /home/container -m container
+            && apt install -y \
+                curl \
+                lsof \
+                ca-certificates \
+                openssl \
+                git \
+                tar \
+                sqlite3 \
+                fontconfig \
+                tzdata \
+                iproute2 \
+                libfreetype6 \
+                tini
 
+
+## Setup user and working directory
+RUN         useradd -m -d /home/container -s /bin/bash container
 USER        container
 ENV         USER=container HOME=/home/container
 WORKDIR     /home/container

diff --git a/java/11j9/Dockerfile b/java/11j9/Dockerfile
@@ -3,17 +3,29 @@ FROM        --platform=$TARGETOS/$TARGETARCH ibm-semeru-runtimes:open-11-jdk
 LABEL       author="Michael Parker" maintainer="[email protected]"
 
 RUN         apt update -y \
-						&& apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 tini \
-						&& useradd -d /home/container -m container
+            && apt install -y \
+                curl \
+                lsof \
+                ca-certificates \
+                openssl \
+                git \
+                tar \
+                sqlite3 \
+                fontconfig \
+                tzdata \
+                iproute2 \
+                libfreetype6 \
+                tini
 
+## Setup user and working directory
+RUN         useradd -m -d /home/container -s /bin/bash container
 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"]
+CMD         ["/entrypoint.sh"]
diff --git a/java/16/Dockerfile b/java/16/Dockerfile
@@ -6,9 +6,22 @@ LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolk
 LABEL       org.opencontainers.image.licenses=MIT
 
 RUN         apt update -y \
-						&& apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 tini \
-						&& useradd -d /home/container -m container
+            && apt install -y \
+                curl \
+                lsof \
+                ca-certificates \
+                openssl \
+                git \
+                tar \
+                sqlite3 \
+                fontconfig \
+                tzdata \
+                iproute2 \
+                libfreetype6 \
+                tini
 
+## Setup user and working directory
+RUN         useradd -m -d /home/container -s /bin/bash container
 USER        container
 ENV         USER=container HOME=/home/container
 WORKDIR     /home/container

diff --git a/java/16j9/Dockerfile b/java/16j9/Dockerfile
@@ -3,12 +3,24 @@ FROM        --platform=$TARGETOS/$TARGETARCH ibm-semeru-runtimes:open-16-jdk
 LABEL       author="Michael Parker" maintainer="[email protected]"
 
 RUN         apt update -y \
-						&& apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 tini \
-						&& useradd -d /home/container -m container
+            && apt install -y \
+                curl \
+                lsof \
+                ca-certificates \
+                openssl \
+                git \
+                tar \
+                sqlite3 \
+                fontconfig \
+                tzdata \
+                iproute2 \
+                libfreetype6 \
+                tini
 
+## Setup user and working directory
+RUN         useradd -m -d /home/container -s /bin/bash container
 USER        container
 ENV         USER=container HOME=/home/container
-
 WORKDIR     /home/container
 
 STOPSIGNAL SIGINT
@@ -17,3 +29,4 @@ COPY        --chown=container:container ./../entrypoint.sh /entrypoint.sh
 RUN         chmod +x /entrypoint.sh
 ENTRYPOINT    ["/usr/bin/tini", "-g", "--"]
 CMD         ["/entrypoint.sh"]
+
diff --git a/java/17/Dockerfile b/java/17/Dockerfile
@@ -1,14 +1,27 @@
-FROM        --platform=$TARGETOS/$TARGETARCH eclipse-temurin:17-jdk-focal
+FROM        --platform=$TARGETOS/$TARGETARCH eclipse-temurin:17-jdk-jammy
 
 LABEL       author="Michael Parker" maintainer="[email protected]"
 
 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 \
-						&& useradd -d /home/container -m container
+            && apt install -y \
+                curl \
+                lsof \
+                ca-certificates \
+                openssl \
+                git \
+                tar \
+                sqlite3 \
+                fontconfig \
+                tzdata \
+                iproute2 \
+                libfreetype6 \
+                tini
 
+## Setup user and working directory
+RUN         useradd -m -d /home/container -s /bin/bash container
 USER        container
 ENV         USER=container HOME=/home/container
 WORKDIR     /home/container

diff --git a/java/19/Dockerfile b/java/19/Dockerfile
@@ -1,14 +1,27 @@
-FROM        --platform=$TARGETOS/$TARGETARCH eclipse-temurin:19-jdk-focal
+FROM        --platform=$TARGETOS/$TARGETARCH eclipse-temurin:19-jdk-jammy
 
 LABEL       author="Michael Parker" maintainer="[email protected]"
 
 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 \
-						&& useradd -d /home/container -m container
+            && apt install -y \
+                curl \
+                lsof \
+                ca-certificates \
+                openssl \
+                git \
+                tar \
+                sqlite3 \
+                fontconfig \
+                tzdata \
+                iproute2 \
+                libfreetype6 \
+                tini
 
+## Setup user and working directory
+RUN         useradd -m -d /home/container -s /bin/bash container
 USER        container
 ENV         USER=container HOME=/home/container
 WORKDIR     /home/container

diff --git a/java/8/Dockerfile b/java/8/Dockerfile
@@ -6,9 +6,22 @@ LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolk
 LABEL       org.opencontainers.image.licenses=MIT
 
 RUN         apt update -y \
-						&& apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 tini \
-						&& useradd -d /home/container -m container
+            && apt install -y \
+                curl \
+                lsof \
+                ca-certificates \
+                openssl \
+                git \
+                tar \
+                sqlite3 \
+                fontconfig \
+                tzdata \
+                iproute2 \
+                libfreetype6 \
+                tini
 
+## Setup user and working directory
+RUN         useradd -m -d /home/container -s /bin/bash container
 USER        container
 ENV         USER=container HOME=/home/container
 WORKDIR     /home/container

diff --git a/java/8j9/Dockerfile b/java/8j9/Dockerfile
@@ -3,12 +3,24 @@ FROM        --platform=$TARGETOS/$TARGETARCH ibm-semeru-runtimes:open-8-jdk
 LABEL       author="Michael Parker" maintainer="[email protected]"
 
 RUN         apt update -y \
-						&& apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 tini \
-						&& useradd -d /home/container -m container
+            && apt install -y \
+                curl \
+                lsof \
+                ca-certificates \
+                openssl \
+                git \
+                tar \
+                sqlite3 \
+                fontconfig \
+                tzdata \
+                iproute2 \
+                libfreetype6 \
+                tini
 
+## Setup user and working directory
+RUN         useradd -m -d /home/container -s /bin/bash container
 USER        container
 ENV         USER=container HOME=/home/container
-
 WORKDIR     /home/container
 
 STOPSIGNAL SIGINT

diff --git a/java/entrypoint.sh b/java/entrypoint.sh