AriasCreations/Yolks
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bump proton version

Browse source
This commit is contained in:
zontreck 2025-02-09 19:25:24 -07:00
parent 1f669dd27e
commit 9c5e5424c3
4 changed files with 122 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Jenkinsfile vendored
View file

@ -213,6 +213,7 @@ pipeline {
docker build -t git.zontreck.com/ariascreations/yolks:steamcmd_debian steamcmd/debian
docker build -t git.zontreck.com/ariascreations/yolks:steamcmd_dotnet steamcmd/dotnet
docker build -t git.zontreck.com/ariascreations/yolks:steamcmd_proton steamcmd/proton
docker build -t git.zontreck.com/ariascreations/yolks:steamcmd_proton9_13 steamcmd/proton_9.13
docker build -t git.zontreck.com/ariascreations/yolks:steamcmd_proton8 steamcmd/proton_8
docker build -t git.zontreck.com/ariascreations/yolks:steamcmd_sniper steamcmd/sniper
docker build -t git.zontreck.com/ariascreations/yolks:steamcmd_ubuntu steamcmd/ubuntu
@ -234,6 +235,7 @@ pipeline {
docker push git.zontreck.com/ariascreations/yolks:steamcmd_debian
docker push git.zontreck.com/ariascreations/yolks:steamcmd_dotnet
docker push git.zontreck.com/ariascreations/yolks:steamcmd_proton
docker push git.zontreck.com/ariascreations/yolks:steamcmd_proton9_13
docker push git.zontreck.com/ariascreations/yolks:steamcmd_proton8
docker push git.zontreck.com/ariascreations/yolks:steamcmd_sniper
docker push git.zontreck.com/ariascreations/yolks:steamcmd_ubuntu

12
steamcmd/proton/Dockerfile
View file

@ -3,7 +3,7 @@ FROM debian:bookworm-slim
LABEL author="Tara Piccari" maintainer="tarapiccari@gmail.com"
LABEL upstream="https://github.com/pelican-eggs/yolks"
ENV PROTON_VERSION=9-13
ENV PROTON_VERSION=9-23
## install required packages
RUN dpkg --add-architecture i386
@ -28,14 +28,14 @@ RUN pipx install protontricks
# Set up Winetricks
RUN wget -q -O /usr/sbin/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \
&& chmod +x /usr/sbin/winetricks
&& chmod +x /usr/sbin/winetricks
## install rcon
RUN cd /tmp/ \
&& curl -sSL https://github.com/gorcon/rcon-cli/releases/download/v0.10.3/rcon-0.10.3-amd64_linux.tar.gz > rcon.tar.gz \
&& tar xvf rcon.tar.gz \
&& mv rcon-0.10.3-amd64_linux/rcon /usr/local/bin/
&& curl -sSL https://github.com/gorcon/rcon-cli/releases/download/v0.10.3/rcon-0.10.3-amd64_linux.tar.gz > rcon.tar.gz \
&& tar xvf rcon.tar.gz \
&& mv rcon-0.10.3-amd64_linux/rcon /usr/local/bin/
USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container

48
steamcmd/proton_9.13/Dockerfile Normal file
View file

@ -0,0 +1,48 @@
FROM debian:bookworm-slim
LABEL author="Tara Piccari" maintainer="tarapiccari@gmail.com"
LABEL upstream="https://github.com/pelican-eggs/yolks"
ENV PROTON_VERSION=9-13
## install required packages
RUN dpkg --add-architecture i386
RUN apt update
RUN apt install -y --no-install-recommends wget iproute2 gnupg2 software-properties-common libntlm0 winbind xvfb xauth libncurses5-dev:i386 libncurses6 dbus libgdiplus lib32gcc-s1
RUN apt install -y alsa-tools libpulse0 pulseaudio libpulse-dev libasound2 libao-common gnutls-bin gnupg locales numactl cabextract curl python3 python3-pip python3-setuptools tini file pipx
RUN useradd -d /home/container -m container
# Download Proton GE
RUN wget https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton${PROTON_VERSION}/GE-Proton${PROTON_VERSION}.tar.gz
RUN tar -xzf GE-Proton*.tar.gz -C /usr/local/bin/ --strip-components=1
RUN rm GE-Proton*.*
# Proton Fix machine-id
RUN rm -f /etc/machine-id
RUN dbus-uuidgen --ensure=/etc/machine-id
RUN rm /var/lib/dbus/machine-id
RUN dbus-uuidgen --ensure
#Setup Protontricks
RUN pipx install protontricks
# Set up Winetricks
RUN wget -q -O /usr/sbin/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \
&& chmod +x /usr/sbin/winetricks
## install rcon
RUN cd /tmp/ \
&& curl -sSL https://github.com/gorcon/rcon-cli/releases/download/v0.10.3/rcon-0.10.3-amd64_linux.tar.gz > rcon.tar.gz \
&& tar xvf rcon.tar.gz \
&& mv rcon-0.10.3-amd64_linux/rcon /usr/local/bin/
USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
STOPSIGNAL SIGINT
COPY --chown=container:container ./entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
CMD ["/entrypoint.sh"]

66
steamcmd/proton_9.13/entrypoint.sh Normal file
View file

@ -0,0 +1,66 @@
# Wait for the container to fully initialize
sleep 1
# 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
# Set environment for Steam Proton
if [ -f "/usr/local/bin/proton" ]; then
if [ ! -z ${SRCDS_APPID} ]; then
mkdir -p /home/container/.steam/steam/steamapps/compatdata/${SRCDS_APPID}
export STEAM_COMPAT_CLIENT_INSTALL_PATH="/home/container/.steam/steam"
export STEAM_COMPAT_DATA_PATH="/home/container/.steam/steam/steamapps/compatdata/${SRCDS_APPID}"
# Fix for pipx with protontricks
export PATH=$PATH:/root/.local/bin
else
echo -e "----------------------------------------------------------------------------------"
echo -e "WARNING!!! Proton needs variable SRCDS_APPID, else it will not work. Please add it"
echo -e "Server stops now"
echo -e "----------------------------------------------------------------------------------"
exit 0
fi
fi
# Switch to the container's working directory
cd /home/container || exit 1
## just in case someone removed the defaults.
if [ "${STEAM_USER}" == "" ]; then
echo -e "steam user is not set.\n"
echo -e "Using anonymous user.\n"
STEAM_USER=anonymous
STEAM_PASS=""
STEAM_AUTH=""
else
echo -e "user set to ${STEAM_USER}"
fi
## if auto_update is not set or to 1 update
if [ -z ${AUTO_UPDATE} ] || [ "${AUTO_UPDATE}" == "1" ]; then
# Update Source Server
if [ ! -z ${SRCDS_APPID} ]; then
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} +app_update 1007 $( [[ -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}" ) ${INSTALL_FLAGS} $( [[ "${VALIDATE}" == "1" ]] && 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} +app_update 1007 $( [[ -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}" ) ${INSTALL_FLAGS} $( [[ "${VALIDATE}" == "1" ]] && 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
# Replace Startup Variables
MODIFIED_STARTUP=$(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
echo -e ":/home/container$ ${MODIFIED_STARTUP}"
# Run the Server
eval ${MODIFIED_STARTUP}