From b6a0f53d20f6abe585b31461d23a2af7bdc66991 Mon Sep 17 00:00:00 2001 From: Christian Torbidone <73131550+killerbossoriginal@users.noreply.github.com> Date: Sat, 14 Sep 2024 14:16:29 +0200 Subject: [PATCH] fix havana --- games/havana/Dockerfile | 4 ++-- games/havana/entrypoint.sh | 49 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 games/havana/entrypoint.sh diff --git a/games/havana/Dockerfile b/games/havana/Dockerfile index caec2b1..2ffaf0d 100644 --- a/games/havana/Dockerfile +++ b/games/havana/Dockerfile @@ -1,5 +1,5 @@ # -# Copyright (c) 2021 Matthew Penner +# Copyright (c) 2024 Thunder Network # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -35,5 +35,5 @@ USER container ENV USER=container HOME=/home/container WORKDIR /home/container -COPY ./../entrypoint.sh /entrypoint.sh +COPY ./entrypoint.sh /entrypoint.sh CMD [ "/bin/bash", "/entrypoint.sh" ] diff --git a/games/havana/entrypoint.sh b/games/havana/entrypoint.sh new file mode 100644 index 0000000..3b61052 --- /dev/null +++ b/games/havana/entrypoint.sh @@ -0,0 +1,49 @@ +#!/bin/bash + +# +# Copyright (c) 2024 Thunder Network +# +# 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-2);exit}') +export INTERNAL_IP + +# Switch to the container's working directory +cd /home/container || exit 1 + +# Print Java version +printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0mjava -version\n" +java -version + +# Convert all of the "{{VARIABLE}}" parts of the command into the expected shell +# variable format of "${VARIABLE}" before evaluating the string and automatically +# replacing the values. +PARSED=$(echo "${STARTUP}" | sed -e 's/{{/${/g' -e 's/}}/}/g' | eval echo "$(cat -)") + +# 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}