Skip to content
This repository has been archived by the owner on Apr 10, 2022. It is now read-only.

Commit

Permalink
Update base to Ubuntu 20.04, Wine 7+.
Browse files Browse the repository at this point in the history
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: ValveSoftware/steam-for-linux#8298
  • Loading branch information
r-pufky committed Feb 6, 2022
1 parent 65f7535 commit 6fa9588
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 21 deletions.
2 changes: 1 addition & 1 deletion Dockerfile/BASE
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile/WINE
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
10 changes: 2 additions & 8 deletions Dockerfile/WINEHQ_STABLE
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
8 changes: 1 addition & 7 deletions Dockerfile/WINEHQ_STAGING
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion source/startup
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 6fa9588

Please sign in to comment.