protontricks test

gOOvER · Dec 20, 2024 · f63deb3 · f63deb3
1 parent 14188ab
commit f63deb3
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 25 deletions.
diff --git a/depotdl/debian/Dockerfile b/depotdl/debian/Dockerfile
@@ -88,6 +88,11 @@ RUN         apt install -y --no-install-recommends \
 
 RUN             rm -rf /var/lib/apt/lists/*
 
+## download DepotDownloader
+RUN         curl -sLOJ $(curl -s https://api.github.com/repos/SteamRE/DepotDownloader/releases/latest | grep browser_download_url | cut -d\" -f4 | egrep linux-x64.zip)
+RUN         unzip DepotDownloader-linux-x64.zip -d /usr/local/bin/
+RUN         chmod +x /usr/local/bin/DepotDownloader
+
 ## install dotnet to support STEAM dotnet games
 RUN         apt update -y \
                 && apt upgrade -y \
@@ -99,10 +104,6 @@ RUN         apt update -y \
                     aspnetcore-runtime-9.0 \
                     dotnet-sdk-9.0
 
-RUN         curl -sLOJ $(curl -s https://api.github.com/repos/SteamRE/DepotDownloader/releases/latest | grep browser_download_url | cut -d\" -f4 | egrep linux-x64.zip)
-RUN         unzip DepotDownloader-linux-x64.zip -d /usr/local/bin/
-RUN         chmod +x /usr/local/bin/DepotDownloader
-
 ## 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 \
@@ -130,7 +131,7 @@ ENV         USER=container HOME=/home/container
 WORKDIR     /home/container
 
 # Sets the default stop signal as wings can (currently) only send a kill or generic stop
-STOPSIGNAL SIGINT
+STOPSIGNAL 	SIGINT
 
 COPY        --chown=container:container ../entrypoint.sh /entrypoint.sh
 RUN         chmod +x /entrypoint.sh

diff --git a/depotdl/wine/Dockerfile b/depotdl/wine/Dockerfile
@@ -80,10 +80,10 @@ RUN             apt install --install-recommends winehq-staging cabextract -y
 RUN	            wget -q -O /usr/sbin/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks
 RUN             chmod +x /usr/sbin/winetricks
 
-# Install DepotDownloader
-RUN             curl -sLOJ $(curl -s https://api.github.com/repos/SteamRE/DepotDownloader/releases/latest | grep browser_download_url | cut -d\" -f4 | egrep linux-x64.zip)
-RUN             unzip DepotDownloader-linux-x64.zip -d /usr/local/bin/
-RUN             chmod +x /usr/local/bin/DepotDownloader
+## download DepotDownloader
+RUN         curl -sLOJ $(curl -s https://api.github.com/repos/SteamRE/DepotDownloader/releases/latest | grep browser_download_url | cut -d\" -f4 | egrep linux-x64.zip)
+RUN         unzip DepotDownloader-linux-x64.zip -d /usr/local/bin/
+RUN         chmod +x /usr/local/bin/DepotDownloader
 
 ## install rcon
 RUN             cd /tmp/ \
@@ -114,7 +114,7 @@ ENV             USER=container HOME=/home/container
 WORKDIR         /home/container
 
 # Sets the default stop signal as wings can (currently) only send a kill or generic stop
-STOPSIGNAL SIGINT
+STOPSIGNAL		SIGINT
 
 COPY            --chown=container:container ../entrypoint.sh /entrypoint.sh
 RUN             chmod +x /entrypoint.sh

diff --git a/steam/proton/Dockerfile b/steam/proton/Dockerfile
@@ -13,13 +13,13 @@ SHELL       [ "/bin/bash", "-c" ]
 
 # setup apt and install needed packages
 ARG         DEBIAN_FRONTEND=noninteractive
-COPY        sources.list /etc/apt/sources.list
 RUN         dpkg --add-architecture i386
-RUN         apt update \ 
+RUN         apt update \
             && apt -y upgrade
 
 RUN         apt install -y --no-install-recommends  \
                 alsa-tools \
+				ca-certificates \
                 cabextract \
                 curl \
                 dbus \
@@ -100,24 +100,18 @@ RUN	        wget -q -O /usr/sbin/winetricks https://raw.githubusercontent.com/Wi
                 && chmod +x /usr/sbin/winetricks
 RUN         wget -q -O /usr/share/bash-completion/completions/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks.bash-completion
 
-# add flatpak repo and Install Protontricks
-#RUN         flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
-#RUN         flatpak -y install flathub com.github.Matoking.protontricks
-#RUN         echo "alias protontricks='flatpak run com.github.Matoking.protontricks'" >> ~/.bashrc
-#RUN         echo "alias protontricks-launch='flatpak run --command=protontricks-launch com.github.Matoking.protontricks'" >> ~/.bashrc
-
-# Install Protontricks 
-#RUN         pipx install protontricks
-#RUN         pipx ensurepath
-#RUN         ln -s /root/.local/bin/protontricks /usr/sbin/protontricks
+# Install Protontricks
+RUN         pipx install protontricks
+RUN         pipx ensurepath
+RUN         ln -s /root/.local/bin/protontricks /usr/local/bin/protontricks
 # Debug
 #RUN         find -name "protontricks"
 
 # Set the locale
 RUN         sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
             locale-gen
-ENV         LANG en_US.UTF-8  
-ENV         LANGUAGE en_US:en  
+ENV         LANG en_US.UTF-8
+ENV         LANGUAGE en_US:en
 ENV         LC_ALL en_US.UTF-8
 
 ## install rcon
@@ -138,4 +132,4 @@ STOPSIGNAL SIGINT
 COPY        --chown=container:container ../entrypoint.sh /entrypoint.sh
 RUN         chmod +x /entrypoint.sh
 ENTRYPOINT  ["/usr/bin/tini", "-g", "--"]
-CMD         ["/entrypoint.sh"]
+CMD         ["/entrypoint.sh"]