diff --git a/distros/alpine/edge/entrypoint.sh b/distros/alpine/edge/entrypoint.sh index 1727469..f221634 100644 --- a/distros/alpine/edge/entrypoint.sh +++ b/distros/alpine/edge/entrypoint.sh @@ -1,9 +1,29 @@ -#!/bin/ash +#!/bin/bash + +clear +RED='\033[0;31m' +GREEN='\033[0;32m' +YELLOW='\033[1;33m' +BLUE='\033[0;34m' +NC='\033[0m' + + +# Wait for the container to fully initialize +sleep 1 # Default the TZ environment variable to UTC. TZ=${TZ:-UTC} export TZ +# Default the IMAGE_PROMPT environment variable to something nice +IMAGE_PROMPT=${IMAGE_PROMPT:-$'\033[1m\033[33mcontainer@gameservertech~ \033[0m'} +export IMAGE_PROMPT + +# Information output +echo -e "${BLUE}---------------------------------------------------------------------${NC}" +echo -e "${YELLOW}Alpine Edge Image from gOOvER${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" + # Set environment variable that holds the Internal Docker IP INTERNAL_IP=$(ip route get 1 | awk '{print $NF;exit}') export INTERNAL_IP @@ -18,7 +38,7 @@ 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" +printf "\033[1m\033[33mcontainer@gameservertech~ \033[0m%s\n" "$PARSED" # shellcheck disable=SC2086 exec env ${PARSED} diff --git a/distros/alpine/latest/entrypoint.sh b/distros/alpine/latest/entrypoint.sh index 1727469..d262c27 100644 --- a/distros/alpine/latest/entrypoint.sh +++ b/distros/alpine/latest/entrypoint.sh @@ -1,9 +1,28 @@ -#!/bin/ash +#!/bin/bash + +clear +RED='\033[0;31m' +GREEN='\033[0;32m' +YELLOW='\033[1;33m' +BLUE='\033[0;34m' +NC='\033[0m' + +# Wait for the container to fully initialize +sleep 1 # Default the TZ environment variable to UTC. TZ=${TZ:-UTC} export TZ +# Default the IMAGE_PROMPT environment variable to something nice +IMAGE_PROMPT=${IMAGE_PROMPT:-$'\033[1m\033[33mcontainer@gameservertech~ \033[0m'} +export IMAGE_PROMPT + +# Information output +echo -e "${BLUE}---------------------------------------------------------------------${NC}" +echo -e "${YELLOW}Image from gOOvER${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" + # Set environment variable that holds the Internal Docker IP INTERNAL_IP=$(ip route get 1 | awk '{print $NF;exit}') export INTERNAL_IP @@ -18,7 +37,7 @@ 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" +printf "\033[1m\033[33mcontainer@gameservertech~ \033[0m%s\n" "$PARSED" # shellcheck disable=SC2086 exec env ${PARSED} diff --git a/distros/archlinux/base/entrypoint.sh b/distros/archlinux/base/entrypoint.sh index 232fd8a..da2373a 100644 --- a/distros/archlinux/base/entrypoint.sh +++ b/distros/archlinux/base/entrypoint.sh @@ -1,13 +1,33 @@ #!/bin/bash -cd /home/container -# Set environment variable that holds the Internal Docker IP -INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') -export INTERNAL_IP +clear +RED='\033[0;31m' +GREEN='\033[0;32m' +YELLOW='\033[1;33m' +BLUE='\033[0;34m' +NC='\033[0m' + +# Wait for the container to fully initialize +sleep 1 + +# Default the TZ environment variable to UTC. +TZ=${TZ:-UTC} +export TZ + +# Default the IMAGE_PROMPT environment variable to something nice +IMAGE_PROMPT=${IMAGE_PROMPT:-$'\033[1m\033[33mcontainer@gameservertech~ \033[0m'} +export IMAGE_PROMPT + +# Information output +echo -e "${BLUE}---------------------------------------------------------------------${NC}" +echo -e "${YELLOW}Image from gOOvER${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" + +cd /home/container # 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} \ No newline at end of file +eval ${MODIFIED_STARTUP} diff --git a/games/foundry/entrypoint.sh b/games/foundry/entrypoint.sh index c446b75..4b59e99 100644 --- a/games/foundry/entrypoint.sh +++ b/games/foundry/entrypoint.sh @@ -25,7 +25,7 @@ TZ=${TZ:-UTC} export TZ # Default the IMAGE_PROMPT environment variable to something nice -IMAGE_PROMPT=${IMAGE_PROMPT:-$'\033[1m\033[33mcontainer@pterodactyl~ \033[0m'} +IMAGE_PROMPT=${IMAGE_PROMPT:-$'\033[1m\033[33mcontainer@gameservertech~ \033[0m'} export IMAGE_PROMPT # Information output @@ -33,7 +33,7 @@ echo -e "${BLUE}---------------------------------------------------------------- echo -e "${YELLOW}Foundry Docker Image with Mod Support${NC}" echo -e "${YELLOW}Copyright 2024 by gOOvER - All rights reserved${NC}" echo -e "${RED}Please note; the egg & image are NOT licensed under the MIT license!!! Redistribution is not permitted${NC}" -echo -e "${BLUE}---------------------------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Debian $(cat /etc/debian_version)${NC}" echo -e "${YELLOW}Current timezone: $(cat /etc/timezone)${NC}" echo -e "${YELLOW}Wine Version:${NC} ${RED} $(wine --version)${NC}" @@ -62,7 +62,7 @@ else fi ## if auto_update is not set or to 1 update -if [ -z ${AUTO_UPDATE} ] || [ "${AUTO_UPDATE}" == "1" ]; then +if [ -z ${AUTO_UPDATE} ] || [ "${AUTO_UPDATE}" == "1" ]; then # Update Server if [ ! -z ${STEAM_APPID} ]; then ./steamcmd/steamcmd.sh +force_install_dir /home/container +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ "${WINDOWS_INSTALL}" == "1" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${STEAM_APPID} $( [[ -z ${STEAM_BETAID} ]] || printf %s "-beta ${STEAM_BETAID}" ) $( [[ -z ${STEAM_BETAPASS} ]] || printf %s "-betapassword ${STEAM_BETAPASS}" ) $( [[ "${VALIDATE}" == "1" ]] && printf %s 'validate' ) +quit @@ -161,4 +161,4 @@ MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g') echo ":/home/container$ ${MODIFIED_STARTUP}" # Run the Server -eval ${MODIFIED_STARTUP} \ No newline at end of file +eval ${MODIFIED_STARTUP} diff --git a/games/wurm/entrypoint.sh b/games/wurm/entrypoint.sh index 241ef62..2275bd6 100644 --- a/games/wurm/entrypoint.sh +++ b/games/wurm/entrypoint.sh @@ -16,7 +16,7 @@ TZ=${TZ:-UTC} export TZ # Default the IMAGE_PROMPT environment variable to something nice -IMAGE_PROMPT=${IMAGE_PROMPT:-$'\033[1m\033[33mcontainer@pterodactyl~ \033[0m'} +IMAGE_PROMPT=${IMAGE_PROMPT:-$'\033[1m\033[33mcontainer@gameservertech~ \033[0m'} export IMAGE_PROMPT # Information output @@ -49,7 +49,7 @@ else fi ## if auto_update is not set or to 1 update -if [ -z ${AUTO_UPDATE} ] || [ "${AUTO_UPDATE}" == "1" ]; then +if [ -z ${AUTO_UPDATE} ] || [ "${AUTO_UPDATE}" == "1" ]; then # Update Source Server if [ ! -z ${STEAM_APPID} ]; then if [ "${STEAM_USER}" == "anonymous" ]; then @@ -78,4 +78,4 @@ MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g') echo ":/home/container$ ${MODIFIED_STARTUP}" # Run the Server -eval ${MODIFIED_STARTUP} \ No newline at end of file +eval ${MODIFIED_STARTUP} diff --git a/wine/entrypoint.sh b/wine/entrypoint.sh index faa596b..1d929c8 100644 --- a/wine/entrypoint.sh +++ b/wine/entrypoint.sh @@ -16,7 +16,7 @@ TZ=${TZ:-UTC} export TZ # Default the IMAGE_PROMPT environment variable to something nice -IMAGE_PROMPT=${IMAGE_PROMPT:-$'\033[1m\033[33mcontainer@pterodactyl~ \033[0m'} +IMAGE_PROMPT=${IMAGE_PROMPT:-$'\033[1m\033[33mcontainer@gameservertech~ \033[0m'} export IMAGE_PROMPT # Information output @@ -55,7 +55,7 @@ if [ -z ${AUTO_UPDATE} ] || [ "${AUTO_UPDATE}" == "1" ]; then if [ -f /home/container/DepotDownloader ]; then ./DepotDownloader -dir /home/container -username ${STEAM_USER} -password ${STEAM_PASS} -remember-password $( [[ "${WINDOWS_INSTALL}" == "1" ]] && printf %s '-os windows' ) -app ${STEAM_APPID} $( [[ -z ${STEAM_BETAID} ]] || printf %s "-beta ${STEAM_BETAID}" ) $( [[ -z ${STEAM_BETAPASS} ]] || printf %s "-betapassword ${STEAM_BETAPASS}" ) mkdir -p /home/container/.steam/sdk64 - ./DepotDownloader -dir /home/container/.steam/sdk64 -app 1007 + ./DepotDownloader -dir /home/container/.steam/sdk64 -os windows -app 1007 chmod +x $HOME/* else diff --git a/wine/staging/Dockerfile b/wine/staging/Dockerfile index 59fa686..a119445 100644 --- a/wine/staging/Dockerfile +++ b/wine/staging/Dockerfile @@ -20,6 +20,7 @@ RUN apt install -y --no-install-recommends \ ffmpeg \ g++ \ gcc \ + gcc-11-base \ gdb \ git \ gnupg2 \