From 290db30d1e980dbb2ee25a57f5f6c9e9f0a551b2 Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Sun, 21 Nov 2021 20:12:21 +0200 Subject: [PATCH] chore: remove reduntant FiveM specific image Not used anywhere and is leftover from matthews upstream repo, from where it was also deleted. FiveM egg uses base debian image. --- .github/workflows/games.yml | 1 - README.md | 2 -- games/fivem/Dockerfile | 38 ------------------------------- games/fivem/entrypoint.sh | 45 ------------------------------------- 4 files changed, 86 deletions(-) delete mode 100644 games/fivem/Dockerfile delete mode 100644 games/fivem/entrypoint.sh diff --git a/.github/workflows/games.yml b/.github/workflows/games.yml index 2c10b23..f230631 100644 --- a/.github/workflows/games.yml +++ b/.github/workflows/games.yml @@ -16,7 +16,6 @@ jobs: fail-fast: false matrix: game: - - fivem - source - rust steps: diff --git a/README.md b/README.md index 663eb34..cbb7358 100644 --- a/README.md +++ b/README.md @@ -33,8 +33,6 @@ is tagged correctly. * [`debian`](https://github.com/pterodactyl/yolks/tree/master/oses/debian) * `ghcr.io/pterodactyl/yolks:debian` * [`games`](https://github.com/pterodactyl/yolks/tree/master/games) - * [`fivem`](https://github.com/pterodactyl/yolks/tree/master/games/fivem) - * `ghcr.io/pterodactyl/games:fivem` * [`rust`](https://github.com/pterodactyl/yolks/tree/master/games/rust) * `ghcr.io/pterodactyl/games:rust` * [`source`](https://github.com/pterodactyl/yolks/tree/master/games/source) diff --git a/games/fivem/Dockerfile b/games/fivem/Dockerfile deleted file mode 100644 index acc46fa..0000000 --- a/games/fivem/Dockerfile +++ /dev/null @@ -1,38 +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=$TARGETOS/$TARGETARCH alpine:latest - -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 c-ares icu-libs libssl1.1 libunwind musl musl-dbg tzdata zlib \ - && 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/fivem/entrypoint.sh b/games/fivem/entrypoint.sh deleted file mode 100644 index 504bf94..0000000 --- a/games/fivem/entrypoint.sh +++ /dev/null @@ -1,45 +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 - -# Set environment variable that holds the Internal Docker IP -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 - -# 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 -)") - -# 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" -# shellcheck disable=SC2086 -exec env ${PARSED}