From ee444da25a1b13d6d9d972b762fa9d0825c83552 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sat, 15 May 2021 12:26:45 -0700 Subject: [PATCH] Move a bunch of files around, try to get things working --- .github/workflows/games.yml | 36 ++++++++++ .github/workflows/go.yml | 37 ++++++++++ .github/workflows/installers.yml | 36 ++++++++++ .github/workflows/java.yml | 3 +- .github/workflows/nodejs.yml | 38 +++++++++++ .github/workflows/python.yml | 37 ++++++++++ .github/workflows/yolks.yml | 67 ++++++++++++++++++ alpine/Dockerfile | 2 +- alpine/entrypoint.sh | 14 ++-- fivem/entrypoint.sh | 41 ----------- {fivem => games/fivem}/Dockerfile | 2 +- {go1.14 => games/fivem}/entrypoint.sh | 15 ++-- {source => games/source}/Dockerfile | 2 +- {source => games/source}/entrypoint.sh | 13 ++-- {go1.14 => go/1.14}/Dockerfile | 4 +- {go1.15 => go/1.15}/Dockerfile | 4 +- {go1.16 => go/1.16}/Dockerfile | 4 +- {go1.15 => go}/entrypoint.sh | 13 ++-- go1.16/entrypoint.sh | 44 ------------ .../alpine}/Dockerfile | 2 +- .../source}/Dockerfile | 2 +- java/11/Dockerfile | 2 +- java/14/Dockerfile | 2 +- java/16/Dockerfile | 2 +- java/7/Dockerfile | 2 +- java/8/Dockerfile | 2 +- java/9/Dockerfile | 2 +- node12/entrypoint.sh | 44 ------------ node15/entrypoint.sh | 44 ------------ node16/entrypoint.sh | 44 ------------ {node12 => nodejs/12}/Dockerfile | 4 +- {node14 => nodejs/14}/Dockerfile | 4 +- {node15 => nodejs/15}/Dockerfile | 4 +- {node16 => nodejs/16}/Dockerfile | 4 +- {node14 => nodejs}/entrypoint.sh | 13 ++-- {python3.7 => python/3.7}/Dockerfile | 4 +- {python3.8 => python/3.8}/Dockerfile | 4 +- {python3.9 => python/3.9}/Dockerfile | 4 +- {python3.7 => python}/entrypoint.sh | 13 ++-- python3.8/entrypoint.sh | 44 ------------ python3.9/entrypoint.sh | 44 ------------ satisfactory/Dockerfile | 52 -------------- satisfactory/README.md | 2 - satisfactory/entrypoint.sh | 68 ------------------- 44 files changed, 327 insertions(+), 497 deletions(-) create mode 100644 .github/workflows/games.yml create mode 100644 .github/workflows/go.yml create mode 100644 .github/workflows/installers.yml create mode 100644 .github/workflows/nodejs.yml create mode 100644 .github/workflows/python.yml create mode 100644 .github/workflows/yolks.yml delete mode 100644 fivem/entrypoint.sh rename {fivem => games/fivem}/Dockerfile (98%) rename {go1.14 => games/fivem}/entrypoint.sh (86%) rename {source => games/source}/Dockerfile (99%) rename {source => games/source}/entrypoint.sh (86%) rename {go1.14 => go/1.14}/Dockerfile (96%) rename {go1.15 => go/1.15}/Dockerfile (96%) rename {go1.16 => go/1.16}/Dockerfile (96%) rename {go1.15 => go}/entrypoint.sh (86%) delete mode 100644 go1.16/entrypoint.sh rename {alpine-install => installers/alpine}/Dockerfile (98%) rename {source-install => installers/source}/Dockerfile (98%) delete mode 100644 node12/entrypoint.sh delete mode 100644 node15/entrypoint.sh delete mode 100644 node16/entrypoint.sh rename {node12 => nodejs/12}/Dockerfile (96%) rename {node14 => nodejs/14}/Dockerfile (96%) rename {node15 => nodejs/15}/Dockerfile (96%) rename {node16 => nodejs/16}/Dockerfile (96%) rename {node14 => nodejs}/entrypoint.sh (86%) rename {python3.7 => python/3.7}/Dockerfile (96%) rename {python3.8 => python/3.8}/Dockerfile (96%) rename {python3.9 => python/3.9}/Dockerfile (96%) rename {python3.7 => python}/entrypoint.sh (86%) delete mode 100644 python3.8/entrypoint.sh delete mode 100644 python3.9/entrypoint.sh delete mode 100644 satisfactory/Dockerfile delete mode 100644 satisfactory/README.md delete mode 100644 satisfactory/entrypoint.sh diff --git a/.github/workflows/games.yml b/.github/workflows/games.yml new file mode 100644 index 0000000..e9040bb --- /dev/null +++ b/.github/workflows/games.yml @@ -0,0 +1,36 @@ +on: + push: + branches: + - tt_master + paths: + - tt_games/** + +jobs: + push: + name: "games:${{ matrix.tag }}" + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + game: + - fivem + - source + steps: + - uses: actions/checkout@v2 + - uses: docker/setup-buildx-action@v1 + with: + version: "v0.5.1" + buildkitd-flags: --debug + - uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.REGISTRY_TOKEN }} + - uses: docker/build-push-action@v2 + with: + context: ./games + file: ./games/${{ matrix.game }}/Dockerfile + platforms: linux/amd64 + push: true + tags: | + ghcr.io/pterodactyl/games:${{ matrix.tag }} diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml new file mode 100644 index 0000000..270f8d1 --- /dev/null +++ b/.github/workflows/go.yml @@ -0,0 +1,37 @@ +on: + push: + branches: + - master + paths: + - tt_go/** + +jobs: + push: + name: "yolks:go_${{ matrix.tag }}" + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + tag: + - 1.14 + - 1.15 + - 1.16 + steps: + - uses: actions/checkout@v2 + - uses: docker/setup-buildx-action@v1 + with: + version: "v0.5.1" + buildkitd-flags: --debug + - uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.REGISTRY_TOKEN }} + - uses: docker/build-push-action@v2 + with: + context: ./go + file: ./go/${{ matrix.tag }}/Dockerfile + platforms: linux/amd64 + push: true + tags: | + ghcr.io/pterodactyl/yolks:go_${{ matrix.tag }} diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml new file mode 100644 index 0000000..d33396b --- /dev/null +++ b/.github/workflows/installers.yml @@ -0,0 +1,36 @@ +on: + push: + branches: + - tt_master + paths: + - installers/** + +jobs: + push: + name: "yolk_installers:{{ matrix.tag }}" + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + tag: + - alpine + - source + steps: + - uses: actions/checkout@v2 + - uses: docker/setup-buildx-action@v1 + with: + version: "v0.5.1" + buildkitd-flags: --debug + - uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.REGISTRY_TOKEN }} + - uses: docker/build-push-action@v2 + with: + context: ./installers + file: ./installers/${{ matrix.tag }}/Dockerfile + platforms: linux/amd64 + push: true + tags: | + ghcr.io/pterodactyl/yolk_installers:${{ matrix.tag }} diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index 1097376..125664c 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -3,10 +3,11 @@ on: branches: - master paths: - - java/* + - tt_java/** jobs: push: + name: "yolks:java_${{ matrix.tag }}" runs-on: ubuntu-latest strategy: fail-fast: false diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml new file mode 100644 index 0000000..4802252 --- /dev/null +++ b/.github/workflows/nodejs.yml @@ -0,0 +1,38 @@ +on: + push: + branches: + - master + paths: + - tt_nodejs/* + +jobs: + push: + name: "yolks:nodejs_${{ matrix.tag }}" + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + tag: + - 12 + - 14 + - 15 + - 16 + steps: + - uses: actions/checkout@v2 + - uses: docker/setup-buildx-action@v1 + with: + version: "v0.5.1" + buildkitd-flags: --debug + - uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.REGISTRY_TOKEN }} + - uses: docker/build-push-action@v2 + with: + context: ./nodejs + file: ./nodejs/${{ matrix.tag }}/Dockerfile + platforms: linux/amd64 + push: true + tags: | + ghcr.io/pterodactyl/yolks:nodejs_${{ matrix.tag }} diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml new file mode 100644 index 0000000..bab9b21 --- /dev/null +++ b/.github/workflows/python.yml @@ -0,0 +1,37 @@ +on: + push: + branches: + - master + paths: + - tt_python/** + +jobs: + push: + name: "yolks:python_${{ matrix.tag }}" + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + tag: + - 3.7 + - 3.8 + - 3.9 + steps: + - uses: actions/checkout@v2 + - uses: docker/setup-buildx-action@v1 + with: + version: "v0.5.1" + buildkitd-flags: --debug + - uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.REGISTRY_TOKEN }} + - uses: docker/build-push-action@v2 + with: + context: ./python + file: ./python/${{ matrix.tag }}/Dockerfile + platforms: linux/amd64 + push: true + tags: | + ghcr.io/pterodactyl/yolks:python_${{ matrix.tag }} diff --git a/.github/workflows/yolks.yml b/.github/workflows/yolks.yml new file mode 100644 index 0000000..044d3da --- /dev/null +++ b/.github/workflows/yolks.yml @@ -0,0 +1,67 @@ +on: + push: + branches: + - master + paths-ignore: + - games + - installers + +jobs: + changes: + runs-on: ubuntu-latest + outputs: + images: ${{ steps.filter.outputs.changes }} + steps: + - uses: actions/checkout@v2 + - uses: dorny/paths-filter@v2 + id: filter + with: + base: HEAD + filters: | + alpine: alpine + go_1.14: go/1.14 + go_1.15: go/1.15 + go_1.16: go/1.16 + python_3.7: python/3.7 + python_3.8: python/3.8 + python_3.9: python/3.9 + nodejs_12: nodejs/12 + nodejs_13: nodejs/13 + nodejs_14: nodejs/14 + nodejs_15: nodejs/15 + java_7: java/7 + java_8: java/8 + java_9: java/9 + java_11: java/11 + java_14: java/14 + java_16: java/16 + + push: + needs: changes + # name: "yolks:python_${{ matrix.tag }}" + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + image: ${{ fromJSON(needs.changes.outputs.images) }} + steps: + - uses: actions/checkout@v2 + - run: | + echo "${{ matrix.image }}" +# - uses: docker/setup-buildx-action@v1 +# with: +# version: "v0.5.1" +# buildkitd-flags: --debug +# - uses: docker/login-action@v1 +# with: +# registry: ghcr.io +# username: ${{ github.repository_owner }} +# password: ${{ secrets.REGISTRY_TOKEN }} +# - uses: docker/build-push-action@v2 +# with: +# context: ./python +# file: ./python/${{ matrix.tag }}/Dockerfile +# platforms: linux/amd64 +# push: true +# tags: | +# ghcr.io/pterodactyl/yolks:python_${{ matrix.tag }} diff --git a/alpine/Dockerfile b/alpine/Dockerfile index c9e17df..9625a87 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -24,7 +24,7 @@ FROM --platform=$BUILDPLATFORM alpine:latest LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" -LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +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 \ diff --git a/alpine/entrypoint.sh b/alpine/entrypoint.sh index 1ecc9fd..f2f559f 100644 --- a/alpine/entrypoint.sh +++ b/alpine/entrypoint.sh @@ -26,16 +26,18 @@ TZ=${TZ:-UTC} export TZ -# Switch to the container's working directory -cd /home/container - # Set environment variable that holds the Internal Docker IP -export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` +INTERNAL_IP=$(ip route get 1 | awk '{print $NF;exit}') +export INTERNAL_IP + +# Switch to the container's working directory +cd /home/container || exit 1 # Replace variables in the startup command -MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')` +MODIFIED_STARTUP=$(eval echo "$(echo "${STARTUP}" | sed -e 's/{{/${/g' -e 's/}}/}/g')") printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' echo "${MODIFIED_STARTUP}" # Run the startup command -exec env ${MODIFIED_STARTUP} +exec env "${MODIFIED_STARTUP}" + diff --git a/fivem/entrypoint.sh b/fivem/entrypoint.sh deleted file mode 100644 index 1ecc9fd..0000000 --- a/fivem/entrypoint.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/ash - -# -# Copyright (c) 2021 Matthew Penner -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. -# - -# Default the TZ environment variable to UTC. -TZ=${TZ:-UTC} -export TZ - -# Switch to the container's working directory -cd /home/container - -# Set environment variable that holds the Internal Docker IP -export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` - -# Replace variables in the startup command -MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')` -printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' -echo "${MODIFIED_STARTUP}" - -# Run the startup command -exec env ${MODIFIED_STARTUP} diff --git a/fivem/Dockerfile b/games/fivem/Dockerfile similarity index 98% rename from fivem/Dockerfile rename to games/fivem/Dockerfile index 4f0820a..ece45de 100644 --- a/fivem/Dockerfile +++ b/games/fivem/Dockerfile @@ -24,7 +24,7 @@ FROM --platform=$BUILDPLATFORM alpine:latest LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" -LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolks" LABEL org.opencontainers.image.licenses=MIT RUN apk add --update --no-cache ca-certificates c-ares icu-libs libssl1.1 libunwind musl musl-dbg tzdata zlib \ diff --git a/go1.14/entrypoint.sh b/games/fivem/entrypoint.sh similarity index 86% rename from go1.14/entrypoint.sh rename to games/fivem/entrypoint.sh index 6051561..f2f559f 100644 --- a/go1.14/entrypoint.sh +++ b/games/fivem/entrypoint.sh @@ -26,19 +26,18 @@ TZ=${TZ:-UTC} export TZ -# Switch to the container's working directory -cd /home/container - # Set environment variable that holds the Internal Docker IP -export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` +INTERNAL_IP=$(ip route get 1 | awk '{print $NF;exit}') +export INTERNAL_IP -# Print Go version -go version +# Switch to the container's working directory +cd /home/container || exit 1 # Replace variables in the startup command -MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')` +MODIFIED_STARTUP=$(eval echo "$(echo "${STARTUP}" | sed -e 's/{{/${/g' -e 's/}}/}/g')") printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' echo "${MODIFIED_STARTUP}" # Run the startup command -exec env ${MODIFIED_STARTUP} +exec env "${MODIFIED_STARTUP}" + diff --git a/source/Dockerfile b/games/source/Dockerfile similarity index 99% rename from source/Dockerfile rename to games/source/Dockerfile index 8e23855..446ebe9 100644 --- a/source/Dockerfile +++ b/games/source/Dockerfile @@ -24,7 +24,7 @@ FROM --platform=$BUILDPLATFORM debian:stable-slim LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" -LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolks" LABEL org.opencontainers.image.licenses=MIT ENV DEBIAN_FRONTEND=noninteractive diff --git a/source/entrypoint.sh b/games/source/entrypoint.sh similarity index 86% rename from source/entrypoint.sh rename to games/source/entrypoint.sh index 3264527..ebeb20a 100644 --- a/source/entrypoint.sh +++ b/games/source/entrypoint.sh @@ -26,16 +26,17 @@ TZ=${TZ:-UTC} export TZ -# Switch to the container's working directory -cd /home/container - # Set environment variable that holds the Internal Docker IP -export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` +INTERNAL_IP=$(ip route get 1 | awk '{print $NF;exit}') +export INTERNAL_IP + +# Switch to the container's working directory +cd /home/container || exit 1 # Replace variables in the startup command -MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')` +MODIFIED_STARTUP=$(eval echo "$(echo "${STARTUP}" | sed -e 's/{{/${/g' -e 's/}}/}/g')") printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' echo "${MODIFIED_STARTUP}" # Run the startup command -exec env ${MODIFIED_STARTUP} +exec env "${MODIFIED_STARTUP}" diff --git a/go1.14/Dockerfile b/go/1.14/Dockerfile similarity index 96% rename from go1.14/Dockerfile rename to go/1.14/Dockerfile index 35e4401..105e773 100644 --- a/go1.14/Dockerfile +++ b/go/1.14/Dockerfile @@ -24,7 +24,7 @@ FROM --platform=$BUILDPLATFORM golang:1.14-alpine LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" -LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +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 \ @@ -34,5 +34,5 @@ USER container ENV USER=container HOME=/home/container WORKDIR /home/container -COPY ./entrypoint.sh /entrypoint.sh +COPY ./../entrypoint.sh /entrypoint.sh CMD [ "/bin/ash", "/entrypoint.sh" ] diff --git a/go1.15/Dockerfile b/go/1.15/Dockerfile similarity index 96% rename from go1.15/Dockerfile rename to go/1.15/Dockerfile index fae099d..50a8531 100644 --- a/go1.15/Dockerfile +++ b/go/1.15/Dockerfile @@ -24,7 +24,7 @@ FROM --platform=$BUILDPLATFORM golang:1.15-alpine LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" -LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +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 \ @@ -34,5 +34,5 @@ USER container ENV USER=container HOME=/home/container WORKDIR /home/container -COPY ./entrypoint.sh /entrypoint.sh +COPY ./../entrypoint.sh /entrypoint.sh CMD [ "/bin/ash", "/entrypoint.sh" ] diff --git a/go1.16/Dockerfile b/go/1.16/Dockerfile similarity index 96% rename from go1.16/Dockerfile rename to go/1.16/Dockerfile index 272f9a8..9855e47 100644 --- a/go1.16/Dockerfile +++ b/go/1.16/Dockerfile @@ -24,7 +24,7 @@ FROM --platform=$BUILDPLATFORM golang:1.16-alpine LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" -LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +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 \ @@ -34,5 +34,5 @@ USER container ENV USER=container HOME=/home/container WORKDIR /home/container -COPY ./entrypoint.sh /entrypoint.sh +COPY ./../entrypoint.sh /entrypoint.sh CMD [ "/bin/ash", "/entrypoint.sh" ] diff --git a/go1.15/entrypoint.sh b/go/entrypoint.sh similarity index 86% rename from go1.15/entrypoint.sh rename to go/entrypoint.sh index 6051561..11e9cc9 100644 --- a/go1.15/entrypoint.sh +++ b/go/entrypoint.sh @@ -26,19 +26,20 @@ TZ=${TZ:-UTC} export TZ -# Switch to the container's working directory -cd /home/container - # Set environment variable that holds the Internal Docker IP -export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` +INTERNAL_IP=$(ip route get 1 | awk '{print $NF;exit}') +export INTERNAL_IP + +# Switch to the container's working directory +cd /home/container || exit 1 # Print Go version go version # Replace variables in the startup command -MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')` +MODIFIED_STARTUP=$(eval echo "$(echo "${STARTUP}" | sed -e 's/{{/${/g' -e 's/}}/}/g')") printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' echo "${MODIFIED_STARTUP}" # Run the startup command -exec env ${MODIFIED_STARTUP} +exec env "${MODIFIED_STARTUP}" diff --git a/go1.16/entrypoint.sh b/go1.16/entrypoint.sh deleted file mode 100644 index 6051561..0000000 --- a/go1.16/entrypoint.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/ash - -# -# Copyright (c) 2021 Matthew Penner -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. -# - -# Default the TZ environment variable to UTC. -TZ=${TZ:-UTC} -export TZ - -# Switch to the container's working directory -cd /home/container - -# Set environment variable that holds the Internal Docker IP -export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` - -# Print Go version -go version - -# Replace variables in the startup command -MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')` -printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' -echo "${MODIFIED_STARTUP}" - -# Run the startup command -exec env ${MODIFIED_STARTUP} diff --git a/alpine-install/Dockerfile b/installers/alpine/Dockerfile similarity index 98% rename from alpine-install/Dockerfile rename to installers/alpine/Dockerfile index 0782f5d..0f6b97f 100644 --- a/alpine-install/Dockerfile +++ b/installers/alpine/Dockerfile @@ -24,7 +24,7 @@ FROM --platform=$BUILDPLATFORM alpine:latest LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" -LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +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 jq wget diff --git a/source-install/Dockerfile b/installers/source/Dockerfile similarity index 98% rename from source-install/Dockerfile rename to installers/source/Dockerfile index d10ffd6..63ec74f 100644 --- a/source-install/Dockerfile +++ b/installers/source/Dockerfile @@ -24,7 +24,7 @@ FROM --platform=$BUILDPLATFORM debian:stable-slim LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" -LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolks" LABEL org.opencontainers.image.licenses=MIT ENV DEBIAN_FRONTEND=noninteractive diff --git a/java/11/Dockerfile b/java/11/Dockerfile index dd6c055..62d61bb 100644 --- a/java/11/Dockerfile +++ b/java/11/Dockerfile @@ -24,7 +24,7 @@ FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk11-openj9:alpine LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" -LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +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 fontconfig git openssl sqlite tar tzdata \ diff --git a/java/14/Dockerfile b/java/14/Dockerfile index a12aadc..6fa6947 100644 --- a/java/14/Dockerfile +++ b/java/14/Dockerfile @@ -24,7 +24,7 @@ FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk14-openj9:alpine LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" -LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +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 fontconfig git openssl sqlite tar tzdata \ diff --git a/java/16/Dockerfile b/java/16/Dockerfile index 395702b..cb98719 100644 --- a/java/16/Dockerfile +++ b/java/16/Dockerfile @@ -24,7 +24,7 @@ FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk16-openj9:alpine LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" -LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +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 fontconfig git openssl sqlite tar tzdata \ diff --git a/java/7/Dockerfile b/java/7/Dockerfile index 7dcba1f..f9ac53d 100644 --- a/java/7/Dockerfile +++ b/java/7/Dockerfile @@ -24,7 +24,7 @@ FROM --platform=$BUILDPLATFORM openjdk:7-jre-alpine LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" -LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +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 fontconfig git openssl sqlite tar tzdata \ diff --git a/java/8/Dockerfile b/java/8/Dockerfile index 70a6cf6..78a93fc 100644 --- a/java/8/Dockerfile +++ b/java/8/Dockerfile @@ -24,7 +24,7 @@ FROM --platform=$BUILDPLATFORM ibmjava:8-jre-alpine LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" -LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +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 fontconfig git openssl sqlite tar tzdata \ diff --git a/java/9/Dockerfile b/java/9/Dockerfile index 8c4f4f9..eb9ea45 100644 --- a/java/9/Dockerfile +++ b/java/9/Dockerfile @@ -24,7 +24,7 @@ FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk9-openj9:alpine LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" -LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +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 fontconfig git openssl sqlite tar tzdata \ diff --git a/node12/entrypoint.sh b/node12/entrypoint.sh deleted file mode 100644 index 926c2a1..0000000 --- a/node12/entrypoint.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/ash - -# -# Copyright (c) 2021 Matthew Penner -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. -# - -# Default the TZ environment variable to UTC. -TZ=${TZ:-UTC} -export TZ - -# Switch to the container's working directory -cd /home/container - -# Set environment variable that holds the Internal Docker IP -export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` - -# Print Node.js version -node -v - -# Replace variables in the startup command -MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')` -printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' -echo "${MODIFIED_STARTUP}" - -# Run the startup command -exec env ${MODIFIED_STARTUP} diff --git a/node15/entrypoint.sh b/node15/entrypoint.sh deleted file mode 100644 index 926c2a1..0000000 --- a/node15/entrypoint.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/ash - -# -# Copyright (c) 2021 Matthew Penner -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. -# - -# Default the TZ environment variable to UTC. -TZ=${TZ:-UTC} -export TZ - -# Switch to the container's working directory -cd /home/container - -# Set environment variable that holds the Internal Docker IP -export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` - -# Print Node.js version -node -v - -# Replace variables in the startup command -MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')` -printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' -echo "${MODIFIED_STARTUP}" - -# Run the startup command -exec env ${MODIFIED_STARTUP} diff --git a/node16/entrypoint.sh b/node16/entrypoint.sh deleted file mode 100644 index 926c2a1..0000000 --- a/node16/entrypoint.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/ash - -# -# Copyright (c) 2021 Matthew Penner -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. -# - -# Default the TZ environment variable to UTC. -TZ=${TZ:-UTC} -export TZ - -# Switch to the container's working directory -cd /home/container - -# Set environment variable that holds the Internal Docker IP -export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` - -# Print Node.js version -node -v - -# Replace variables in the startup command -MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')` -printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' -echo "${MODIFIED_STARTUP}" - -# Run the startup command -exec env ${MODIFIED_STARTUP} diff --git a/node12/Dockerfile b/nodejs/12/Dockerfile similarity index 96% rename from node12/Dockerfile rename to nodejs/12/Dockerfile index 37da987..3a568f9 100644 --- a/node12/Dockerfile +++ b/nodejs/12/Dockerfile @@ -24,7 +24,7 @@ FROM --platform=$BUILDPLATFORM node:12-alpine LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" -LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +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 ffmpeg git openssl sqlite tar tzdata \ @@ -34,5 +34,5 @@ USER container ENV USER=container HOME=/home/container WORKDIR /home/container -COPY ./entrypoint.sh /entrypoint.sh +COPY ./../entrypoint.sh /entrypoint.sh CMD [ "/bin/ash", "/entrypoint.sh" ] diff --git a/node14/Dockerfile b/nodejs/14/Dockerfile similarity index 96% rename from node14/Dockerfile rename to nodejs/14/Dockerfile index 1c1b68d..2528511 100644 --- a/node14/Dockerfile +++ b/nodejs/14/Dockerfile @@ -24,7 +24,7 @@ FROM --platform=$BUILDPLATFORM node:14-alpine LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" -LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +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 ffmpeg git openssl sqlite tar tzdata \ @@ -34,5 +34,5 @@ USER container ENV USER=container HOME=/home/container WORKDIR /home/container -COPY ./entrypoint.sh /entrypoint.sh +COPY ./../entrypoint.sh /entrypoint.sh CMD [ "/bin/ash", "/entrypoint.sh" ] diff --git a/node15/Dockerfile b/nodejs/15/Dockerfile similarity index 96% rename from node15/Dockerfile rename to nodejs/15/Dockerfile index eca47cd..d572184 100644 --- a/node15/Dockerfile +++ b/nodejs/15/Dockerfile @@ -24,7 +24,7 @@ FROM --platform=$BUILDPLATFORM node:15-alpine LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" -LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +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 ffmpeg git openssl sqlite tar tzdata \ @@ -34,5 +34,5 @@ USER container ENV USER=container HOME=/home/container WORKDIR /home/container -COPY ./entrypoint.sh /entrypoint.sh +COPY ./../entrypoint.sh /entrypoint.sh CMD [ "/bin/ash", "/entrypoint.sh" ] diff --git a/node16/Dockerfile b/nodejs/16/Dockerfile similarity index 96% rename from node16/Dockerfile rename to nodejs/16/Dockerfile index 497d535..f725c40 100644 --- a/node16/Dockerfile +++ b/nodejs/16/Dockerfile @@ -24,7 +24,7 @@ FROM --platform=$BUILDPLATFORM node:16-alpine LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" -LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +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 ffmpeg git openssl sqlite tar tzdata \ @@ -34,5 +34,5 @@ USER container ENV USER=container HOME=/home/container WORKDIR /home/container -COPY ./entrypoint.sh /entrypoint.sh +COPY ./../entrypoint.sh /entrypoint.sh CMD [ "/bin/ash", "/entrypoint.sh" ] diff --git a/node14/entrypoint.sh b/nodejs/entrypoint.sh similarity index 86% rename from node14/entrypoint.sh rename to nodejs/entrypoint.sh index 926c2a1..d5f2a28 100644 --- a/node14/entrypoint.sh +++ b/nodejs/entrypoint.sh @@ -26,19 +26,20 @@ TZ=${TZ:-UTC} export TZ -# Switch to the container's working directory -cd /home/container - # Set environment variable that holds the Internal Docker IP -export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` +INTERNAL_IP=$(ip route get 1 | awk '{print $NF;exit}') +export INTERNAL_IP + +# Switch to the container's working directory +cd /home/container || exit 1 # Print Node.js version node -v # Replace variables in the startup command -MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')` +MODIFIED_STARTUP=$(eval echo "$(echo "${STARTUP}" | sed -e 's/{{/${/g' -e 's/}}/}/g')") printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' echo "${MODIFIED_STARTUP}" # Run the startup command -exec env ${MODIFIED_STARTUP} +exec env "${MODIFIED_STARTUP}" diff --git a/python3.7/Dockerfile b/python/3.7/Dockerfile similarity index 96% rename from python3.7/Dockerfile rename to python/3.7/Dockerfile index eb2ce19..2ecb0fb 100644 --- a/python3.7/Dockerfile +++ b/python/3.7/Dockerfile @@ -24,7 +24,7 @@ FROM --platform=$BUILDPLATFORM python:3.7-alpine LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" -LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +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 ffmpeg g++ gcc git openssl sqlite tar tzdata \ @@ -34,5 +34,5 @@ USER container ENV USER=container HOME=/home/container WORKDIR /home/container -COPY ./entrypoint.sh /entrypoint.sh +COPY ./../entrypoint.sh /entrypoint.sh CMD [ "/bin/ash", "/entrypoint.sh" ] diff --git a/python3.8/Dockerfile b/python/3.8/Dockerfile similarity index 96% rename from python3.8/Dockerfile rename to python/3.8/Dockerfile index cda0081..8a5696b 100644 --- a/python3.8/Dockerfile +++ b/python/3.8/Dockerfile @@ -24,7 +24,7 @@ FROM --platform=$BUILDPLATFORM python:3.8-alpine LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" -LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +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 ffmpeg g++ gcc git openssl sqlite tar tzdata \ @@ -34,5 +34,5 @@ USER container ENV USER=container HOME=/home/container WORKDIR /home/container -COPY ./entrypoint.sh /entrypoint.sh +COPY ./../entrypoint.sh /entrypoint.sh CMD [ "/bin/ash", "/entrypoint.sh" ] diff --git a/python3.9/Dockerfile b/python/3.9/Dockerfile similarity index 96% rename from python3.9/Dockerfile rename to python/3.9/Dockerfile index 5293b85..4c79bf4 100644 --- a/python3.9/Dockerfile +++ b/python/3.9/Dockerfile @@ -24,7 +24,7 @@ FROM --platform=$BUILDPLATFORM python:3.9-alpine LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" -LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +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 ffmpeg g++ gcc git openssl sqlite tar tzdata \ @@ -34,5 +34,5 @@ USER container ENV USER=container HOME=/home/container WORKDIR /home/container -COPY ./entrypoint.sh /entrypoint.sh +COPY ./../entrypoint.sh /entrypoint.sh CMD [ "/bin/ash", "/entrypoint.sh" ] diff --git a/python3.7/entrypoint.sh b/python/entrypoint.sh similarity index 86% rename from python3.7/entrypoint.sh rename to python/entrypoint.sh index d157bf6..df6128b 100644 --- a/python3.7/entrypoint.sh +++ b/python/entrypoint.sh @@ -26,19 +26,20 @@ TZ=${TZ:-UTC} export TZ -# Switch to the container's working directory -cd /home/container - # Set environment variable that holds the Internal Docker IP -export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` +INTERNAL_IP=$(ip route get 1 | awk '{print $NF;exit}') +export INTERNAL_IP + +# Switch to the container's working directory +cd /home/container || exit 1 # Print Python version python --version # Replace variables in the startup command -MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')` +MODIFIED_STARTUP=$(eval echo "$(echo "${STARTUP}" | sed -e 's/{{/${/g' -e 's/}}/}/g')") printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' echo "${MODIFIED_STARTUP}" # Run the startup command -exec env ${MODIFIED_STARTUP} +exec env "${MODIFIED_STARTUP}" diff --git a/python3.8/entrypoint.sh b/python3.8/entrypoint.sh deleted file mode 100644 index d157bf6..0000000 --- a/python3.8/entrypoint.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/ash - -# -# Copyright (c) 2021 Matthew Penner -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. -# - -# Default the TZ environment variable to UTC. -TZ=${TZ:-UTC} -export TZ - -# Switch to the container's working directory -cd /home/container - -# Set environment variable that holds the Internal Docker IP -export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` - -# Print Python version -python --version - -# Replace variables in the startup command -MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')` -printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' -echo "${MODIFIED_STARTUP}" - -# Run the startup command -exec env ${MODIFIED_STARTUP} diff --git a/python3.9/entrypoint.sh b/python3.9/entrypoint.sh deleted file mode 100644 index d157bf6..0000000 --- a/python3.9/entrypoint.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/ash - -# -# Copyright (c) 2021 Matthew Penner -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. -# - -# Default the TZ environment variable to UTC. -TZ=${TZ:-UTC} -export TZ - -# Switch to the container's working directory -cd /home/container - -# Set environment variable that holds the Internal Docker IP -export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` - -# Print Python version -python --version - -# Replace variables in the startup command -MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')` -printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' -echo "${MODIFIED_STARTUP}" - -# Run the startup command -exec env ${MODIFIED_STARTUP} diff --git a/satisfactory/Dockerfile b/satisfactory/Dockerfile deleted file mode 100644 index 3124e91..0000000 --- a/satisfactory/Dockerfile +++ /dev/null @@ -1,52 +0,0 @@ -# -# Copyright (c) 2021 Matthew Penner -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. -# - -FROM --platform=$BUILDPLATFORM debian:stable-slim - -LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" - -LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" -LABEL org.opencontainers.image.licenses=MIT - -ENV DEBIAN_FRONTEND=noninteractive - -RUN dpkg --add-architecture i386 \ - && apt update \ - && apt upgrade -y \ - && apt install -y gnupg wget \ - && wget -q https://dl.winehq.org/wine-builds/winehq.key -O- | apt-key add - \ - && echo "deb https://dl.winehq.org/wine-builds/debian/ buster main" >> /etc/apt/sources.list \ - && apt update \ - && apt install -y curl g++ gcc gdb iproute2 lib32gcc1 lib32stdc++6 lib32tinfo6 lib32z1 libcurl3-gnutls:i386 libcurl4-gnutls-dev:i386 libcurl4:i386 libfontconfig libgcc1 libncurses5:i386 libncurses6:i386 libntlm0 libsdl1.2debian libsdl2-2.0-0:i386 libssl1.1:i386 libtinfo6:i386 net-tools netcat python3 tar telnet tzdata winbind xauth xvfb \ - && wget -nc https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_10/amd64/libfaudio0_20.01-0~buster_amd64.deb \ - && wget -nc https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_10/i386/libfaudio0_20.01-0~buster_i386.deb \ - && apt install -y ./libfaudio0_20.01-0~buster_* \ - && apt install -y --install-recommends cabextract winehq-stable \ - && useradd -m -d /home/container container \ - && rm -rf /libfaudio0_20.01-0~buster_amd64.deb /libfaudio0_20.01-0~buster_i386.deb /var/lib/apt/lists/* - -USER container -ENV USER=container HOME=/home/container -WORKDIR /home/container - -COPY ./entrypoint.sh /entrypoint.sh -CMD [ "/bin/bash", "/entrypoint.sh" ] diff --git a/satisfactory/README.md b/satisfactory/README.md deleted file mode 100644 index 75d1bc4..0000000 --- a/satisfactory/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# Satisfactory -SoonTM diff --git a/satisfactory/entrypoint.sh b/satisfactory/entrypoint.sh deleted file mode 100644 index 0c77e1d..0000000 --- a/satisfactory/entrypoint.sh +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/bash - -# -# Copyright (c) 2021 Matthew Penner -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. -# - -# Default the TZ environment variable to UTC -TZ=${TZ:-UTC} -export TZ - -# Set the GAMECONFIGDIR environment variable -GAMECONFIGDIR="/home/container/.wine/drive_c/users/container/Local Settings/Application Data/FactoryGame/Saved" -export GAMECONFIGDIR - -# Switch to the container's working directory -cd /home/container - -# Create required directories -mkdir -p /home/container/config /home/container/gamefiles /home/container/saves "$GAMECONFIGDIR/Config/WindowsNoEditor" "$GAMECONFIGDIR/Logs" "$GAMECONFIGDIR/SaveGames/common" - -# Touch the log file -touch "$GAMECONFIGDIR/Logs/FactoryGame.log" - -# Copy config files -cp /home/container/config/{Engine.ini,Game.ini,Scalability.ini} "$GAMECONFIGDIR/Config/WindowsNoEditor/" - -# Copy save files -cp -rp /home/container/saves/*.sav "$GAMECONFIGDIR/SaveGames/common/" - -# Get the latest save file -LATEST_SAVE_FILE=$(ls -Art "$GAMECONFIGDIR/SaveGames/common" | tail -n 1) - -# Move latest save file -if [[ ! "$LATEST_SAVE_FILE" == "savefile.sav" ]]; then - printf "\\nMoving most recent save (%s) to savefile.sav\\n" "$LATEST_SAVE_FILE" - mv "$GAMECONFIGDIR/SaveGames/common/$LATEST_SAVE_FILE" "$GAMECONFIGDIR/SaveGames/common/savefile.sav" -fi - -# Switch to the gamefiles directory -cd /home/container/gamefiles - -# Start Satisfactory (runs in the background) -printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' -echo "wine start FactoryGame.exe -nosteamclient -nullrhi -nosplash -nosound" -wine start FactoryGame.exe -nosteamclient -nullrhi -nosplash -nosound - -# Tail the satisfactory log file -printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' -echo "tail -f \"$GAMECONFIGDIR/Logs/FactoryGame.log\"" -tail -f "$GAMECONFIGDIR/Logs/FactoryGame.log"