From 6fa9588f0d7a4b0f6006b3a565157686364d97b4 Mon Sep 17 00:00:00 2001
From: Robert Pufky <rpufky@gmail.com>
Date: Sun, 6 Feb 2022 05:56:19 -0800
Subject: [PATCH] Update base to Ubuntu 20.04, Wine 7+.

Changes:
* base image migrated from 18.04 to 20.04.
* Remove Wine 5.x - <7.0 libfaudio0 patches. These are included in wine by defualt now.
* Reordered force_install_dir to be set before login, preventing execution halt with
  latest steamcmd release. See: https://github.com/ValveSoftware/steam-for-linux/issues/8298
---
 Dockerfile/BASE           |  2 +-
 Dockerfile/WINE           |  2 +-
 Dockerfile/WINEHQ_STABLE  | 10 ++--------
 Dockerfile/WINEHQ_STAGING |  8 +-------
 README.md                 |  6 +++---
 source/startup            |  2 +-
 6 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/Dockerfile/BASE b/Dockerfile/BASE
index 0da0bc0..a84726b 100644
--- a/Dockerfile/BASE
+++ b/Dockerfile/BASE
@@ -1,7 +1,7 @@
 # steam dedicated server for docker.
 # https://developer.valvesoftware.com/wiki/SteamCMD#Linux.2FOS_X
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV SERVER_DIR=/data/server \
     STEAM=/steam \
diff --git a/Dockerfile/WINE b/Dockerfile/WINE
index 1840358..a9108d6 100644
--- a/Dockerfile/WINE
+++ b/Dockerfile/WINE
@@ -3,7 +3,7 @@ dpkg --add-architecture i386 && \
 apt-get --quiet update && \
 apt-get --quiet --yes upgrade && \
 apt-get install --yes --install-recommends \
-  lib32gcc1 \
+  lib32gcc-s1 \
   wine-stable \
   wine32 \
   wine64 \
diff --git a/Dockerfile/WINEHQ_STABLE b/Dockerfile/WINEHQ_STABLE
index e92c4bb..abec9b7 100644
--- a/Dockerfile/WINEHQ_STABLE
+++ b/Dockerfile/WINEHQ_STABLE
@@ -1,22 +1,16 @@
 # Add wine
 dpkg --add-architecture i386 && \
 wget -qO - https://dl.winehq.org/wine-builds/winehq.key | apt-key add - && \
-apt-add-repository 'deb https://dl.winehq.org/wine-builds/ubuntu/ bionic main' && \
+apt-add-repository 'deb https://dl.winehq.org/wine-builds/ubuntu/ focal main' && \
 apt-get --quiet update && \
-# Wine 5.x+ requires libfaudio0, but not included on Ubuntu < 19.10.
-# https://forum.winehq.org/viewtopic.php?f=8&t=32192
-# https://askubuntu.com/questions/1100351/broken-packages-fix-problem-for-wine
 apt-get install --yes --install-recommends \
   libsdl2-2.0-0 \
   libsdl2-2.0-0:i386 \
   libc6 \
   libc6:i386 && \
-wget https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_18.04/amd64/libfaudio0_19.07-0~bionic_amd64.deb -O /tmp/libfaudio0_19.07-0~bionic_amd64.deb && \
-wget https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_18.04/i386/libfaudio0_19.07-0~bionic_i386.deb -O /tmp/libfaudio0_19.07-0~bionic_i386.deb && \
-dpkg -i /tmp/libfaudio0_19.07-0~bionic_amd64.deb /tmp/libfaudio0_19.07-0~bionic_i386.deb && \
 apt-get --quiet --yes upgrade && \
 apt-get install --yes --install-recommends \
-  lib32gcc1 \
+  lib32gcc-s1 \
   winehq-stable \
   winbind \
   supervisor \
diff --git a/Dockerfile/WINEHQ_STAGING b/Dockerfile/WINEHQ_STAGING
index 1401313..2f64ebc 100644
--- a/Dockerfile/WINEHQ_STAGING
+++ b/Dockerfile/WINEHQ_STAGING
@@ -3,20 +3,14 @@ dpkg --add-architecture i386 && \
 wget -qO - https://dl.winehq.org/wine-builds/winehq.key | apt-key add - && \
 apt-add-repository 'deb https://dl.winehq.org/wine-builds/ubuntu/ bionic main' && \
 apt-get --quiet update && \
-# Wine 5.x+ requires libfaudio0, but not included on Ubuntu < 19.10.
-# https://forum.winehq.org/viewtopic.php?f=8&t=32192
-# https://askubuntu.com/questions/1100351/broken-packages-fix-problem-for-wine
 apt-get install --yes --install-recommends \
   libsdl2-2.0-0 \
   libsdl2-2.0-0:i386 \
   libc6 \
   libc6:i386 && \
-wget https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_18.04/amd64/libfaudio0_19.07-0~bionic_amd64.deb -O /tmp/libfaudio0_19.07-0~bionic_amd64.deb && \
-wget https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_18.04/i386/libfaudio0_19.07-0~bionic_i386.deb -O /tmp/libfaudio0_19.07-0~bionic_i386.deb && \
-dpkg -i /tmp/libfaudio0_19.07-0~bionic_amd64.deb /tmp/libfaudio0_19.07-0~bionic_i386.deb && \
 apt-get --quiet --yes upgrade && \
 apt-get install --yes --install-recommends \
-  lib32gcc1 \
+  lib32gcc-s1 \
   winehq-staging \
   winbind \
   supervisor \
diff --git a/README.md b/README.md
index 181b4cf..9c0cf84 100644
--- a/README.md
+++ b/README.md
@@ -34,9 +34,9 @@ Fully working examples of different dedicated servers.
 
 | Tag          | Description                                                                     |
 |--------------|---------------------------------------------------------------------------------|
-| stable       | Ubuntu 18.04: wine, steamcmd (package).                                         |
-| latest       | Ubuntu 18.04: winehq STABLE packages, steamcmd (package). This **WILL** break.  |
-| experimental | Ubuntu 18.04: winehq STAGING packages, steamcmd (package). This **WILL** break. |
+| stable       | Ubuntu 20.04: wine, steamcmd (package).                                         |
+| latest       | Ubuntu 20.04: winehq STABLE packages, steamcmd (package). This **WILL** break.  |
+| experimental | Ubuntu 20.04: winehq STAGING packages, steamcmd (package). This **WILL** break. |
 * Containers are automatically rebuilt weekly.
 
 ## Parameters
diff --git a/source/startup b/source/startup
index d97ee73..a5cd6bd 100644
--- a/source/startup
+++ b/source/startup
@@ -35,8 +35,8 @@ if [ ${UPDATE_SERVER} -eq 1 ]; then
   echo "Updating app ${STEAM_APP_ID} ..."
   su steam -c "steamcmd \
     +@sSteamCmdForcePlatformType ${PLATFORM} \
-    +login anonymous \
     +force_install_dir ${SERVER_DIR} \
+    +login anonymous \
     +app_update ${STEAM_APP_ID} \
     ${STEAM_APP_EXTRAS} \
     +quit"