Skip to content

Commit cc18eb3

Browse files
committed
Refinements
1 parent 621051b commit cc18eb3

File tree

1 file changed

+24
-9
lines changed

1 file changed

+24
-9
lines changed

base/debian/Dockerfile

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,35 +12,50 @@ ENV LD_LIBRARY_PATH="./:/opt/cubecoders/amp/:/AMP/"
1212
ARG DEBIAN_FRONTEND=noninteractive
1313
ARG TARGETARCH
1414

15-
# Update base packages and install dependencies, including temp fix if libssl1.1 needed
15+
# Update base packages and install dependencies
1616
RUN set -eux; \
1717
mkdir -p /usr/share/man/man1; \
1818
apt-get update; \
1919
apt-get install -y --no-install-recommends \
20-
ca-certificates software-properties-common curl wget tar unzip xz-utils bzip2 \
21-
coreutils procps net-tools iproute2 iputils-ping socat jq git git-lfs gnupg lsof tmux sqlite3 gdb \
20+
ca-certificates curl wget tar unzip xz-utils bzip2 \
21+
coreutils procps net-tools iproute2 iputils-ping socat jq git git-lfs gnupg lsof tmux sqlite3 \
2222
tini tzdata locales \
23+
libcurl4 libfontconfig1 libsqlite3-0 libzstd1 libsdl2-2.0-0 libsdl1.2-compat \
24+
# Required for Core Keeper
2325
xvfb xauth libxi6 \
24-
libc6 libc++-dev libcurl4 libatomic1 libpulse-dev liblua5.3-0 libfontconfig1 libgdiplus libsqlite3-0 libzstd1 libsdl2-2.0-0 libsdl1.2-compat; \
26+
# Required for Valheim crossplay (and some others)
27+
libc6 libatomic1 libpulse-dev \
28+
# Required for BeamMP
29+
liblua5.3-0 \
30+
# Required for Eco
31+
libgdiplus \
32+
# Required for Pavlov VR (and some others)
33+
gdb libc++-dev; \
2534
if [ "$TARGETARCH" = "amd64" ]; then \
2635
dpkg --add-architecture i386; \
2736
apt-get update; \
2837
apt-get install -y --no-install-recommends \
29-
libc6:i386 libstdc++6:i386 libgcc-s1:i386 zlib1g:i386 libbz2-1.0:i386 libzstd1:i386 libcurl4:i386 libcurl3-gnutls:i386 libcurl4-gnutls-dev:i386 \
38+
# Required for steamcmd
39+
libgcc-s1:i386 \
40+
# Others
41+
libc6:i386 libstdc++6:i386 zlib1g:i386 libbz2-1.0:i386 libzstd1:i386 libcurl4:i386 libcurl3-gnutls:i386 libcurl4-gnutls-dev:i386 \
3042
libtinfo6:i386 libncurses6:i386 libncurses5:i386 libtinfo5:i386 libsdl2-2.0-0:i386 libsdl1.2-compat:i386 libssl-dev:i386; \
3143
fi; \
44+
# Temp fix if libssl1.1 needed
3245
case "$TARGETARCH" in \
33-
amd64) wget -qO libssl1.1.deb https://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.0g-2ubuntu4_amd64.deb ;; \
34-
arm64) wget -qO libssl1.1.deb https://ports.ubuntu.com/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_arm64.deb ;; \
46+
amd64) wget -qO libssl1.1.deb https://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.0g-2ubuntu4_amd64.deb;; \
47+
arm64) wget -qO libssl1.1.deb https://ports.ubuntu.com/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_arm64.deb;; \
3548
esac; \
3649
apt-get install -y --no-install-recommends ./libssl1.1.deb; \
3750
rm libssl1.1.deb; \
51+
# Install AMP instance manager
3852
case "$TARGETARCH" in \
39-
amd64) wget -q https://cdn-repo.c7rs.com/ampinstmgr-latest.tgz ;; \
40-
arm64) wget -q https://cdn-repo.c7rs.com/aarch64/ampinstmgr-latest.tgz ;; \
53+
amd64) wget -q https://cdn-repo.c7rs.com/ampinstmgr-latest.tgz;; \
54+
arm64) wget -q https://cdn-repo.c7rs.com/aarch64/ampinstmgr-latest.tgz;; \
4155
esac; \
4256
tar -xzf ampinstmgr-latest.tgz -C /; \
4357
rm ampinstmgr-latest.tgz; \
58+
# Set up locales
4459
sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen; \
4560
locale-gen; \
4661
apt-get clean; \

0 commit comments

Comments
 (0)