From d316775d802ce8c04919ba3a554779a2ed18cc73 Mon Sep 17 00:00:00 2001 From: gOOvER Date: Sun, 22 Jan 2023 16:56:48 +0100 Subject: [PATCH] add fix for login --- wine/entrypoint.sh | 9 +++++++-- wine/latest/Dockerfile | 2 +- wine/staging/Dockerfile | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/wine/entrypoint.sh b/wine/entrypoint.sh index 72958b2..056920b 100644 --- a/wine/entrypoint.sh +++ b/wine/entrypoint.sh @@ -22,13 +22,18 @@ 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 ${SRCDS_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 ${SRCDS_APPID} $( [[ ! -z ${SRCDS_BETAID} ]] && printf %s "-beta ${SRCDS_BETAID}" ) $( [[ ! -z ${SRCDS_BETAPASS} ]] && printf %s "-betapassword ${SRCDS_BETAPASS}" ) $( [[ ! -z ${HLDS_GAME} ]] && printf %s "+app_set_config 90 mod ${HLDS_GAME}" ) $( [[ ! -z ${VALIDATE} ]] && printf %s "validate" ) +quit + if [ "${STEAM_USER}" == "anonymous" ]; 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 ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s "-beta ${SRCDS_BETAID}" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s "-betapassword ${SRCDS_BETAPASS}" ) $( [[ -z ${HLDS_GAME} ]] || printf %s "+app_set_config 90 mod ${HLDS_GAME}" ) $( [[ -z ${VALIDATE} ]] || printf %s "validate" ) +quit + else + numactl --physcpubind=+0 ./steamcmd/steamcmd.sh +force_install_dir /home/container +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ "${WINDOWS_INSTALL}" == "1" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s "-beta ${SRCDS_BETAID}" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s "-betapassword ${SRCDS_BETAPASS}" ) $( [[ -z ${HLDS_GAME} ]] || printf %s "+app_set_config 90 mod ${HLDS_GAME}" ) $( [[ -z ${VALIDATE} ]] || printf %s "validate" ) +quit + fi else echo -e "No appid set. Starting Server" fi + else echo -e "Not updating game server as auto update was set to 0. Starting Server" fi diff --git a/wine/latest/Dockerfile b/wine/latest/Dockerfile index 53de18c..f587452 100644 --- a/wine/latest/Dockerfile +++ b/wine/latest/Dockerfile @@ -8,7 +8,7 @@ LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" ## install required packages RUN dpkg --add-architecture i386 \ && apt update -y \ - && apt install -y --no-install-recommends gnupg2 tzdata software-properties-common libntlm0 winbind xvfb xauth python3 libncurses5:i386 libncurses6:i386 libsdl2-2.0-0 libsdl2-2.0-0:i386 + && apt install -y --no-install-recommends gnupg2 numactl tzdata software-properties-common libntlm0 winbind xvfb xauth python3 libncurses5:i386 libncurses6:i386 libsdl2-2.0-0 libsdl2-2.0-0:i386 # Install winehq-stable and with recommends RUN wget -nc https://dl.winehq.org/wine-builds/winehq.key \ diff --git a/wine/staging/Dockerfile b/wine/staging/Dockerfile index e84a4f6..6c7d761 100644 --- a/wine/staging/Dockerfile +++ b/wine/staging/Dockerfile @@ -8,7 +8,7 @@ LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" ## install required packages RUN dpkg --add-architecture i386 \ && apt update -y \ - && apt install -y --no-install-recommends gnupg2 tzdata software-properties-common libntlm0 winbind xvfb xauth python3 libncurses5:i386 libncurses6:i386 libsdl2-2.0-0 libsdl2-2.0-0:i386 + && apt install -y --no-install-recommends gnupg2 tzdata numactl software-properties-common libntlm0 winbind xvfb xauth python3 libncurses5:i386 libncurses6:i386 libsdl2-2.0-0 libsdl2-2.0-0:i386 # Install winehq-stable and with recommends RUN wget -nc https://dl.winehq.org/wine-builds/winehq.key \