Skip to content

Commit e826cb4

Browse files
committed
fix: tidy up package handling
1 parent 0ee5389 commit e826cb4

File tree

3 files changed

+12
-13
lines changed

3 files changed

+12
-13
lines changed

base/debian/Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ ARG TARGETARCH
1616
RUN set -eux; \
1717
mkdir -p /usr/share/man/man1; \
1818
apt-get update; \
19-
apt-get install -y --no-install-recommends \
19+
apt-get install -y \
2020
ca-certificates curl wget tar unzip xz-utils bzip2 \
21-
coreutils procps iproute2 iputils-ping socat jq git git-lfs gnupg tmux sqlite3 dbus \
21+
coreutils procps iproute2 iputils-ping socat jq git git-lfs gnupg tmux dbus \
2222
tini tzdata locales \
2323
libssl3 libcurl4 libsqlite3-0 libzstd1 libsdl2-2.0-0 libsdl1.2-compat \
2424
# Required for Core Keeper
@@ -35,22 +35,22 @@ RUN set -eux; \
3535
amd64) \
3636
dpkg --add-architecture i386; \
3737
apt-get update; \
38-
apt-get install -y --no-install-recommends \
38+
apt-get install -y \
3939
# Required for steamcmd
4040
libgcc-s1:i386 \
4141
# Others
4242
libstdc++6:i386 zlib1g:i386 libbz2-1.0:i386 libcurl4:i386 libcurl3-gnutls:i386 libcurl4-gnutls-dev:i386 \
43-
libncurses6:i386 libncurses5:i386 libtinfo6:i386 libtinfo5:i386 libsdl2-2.0-0:i386 libssl-dev:i386; \
43+
libncurses6:i386 libncurses5:i386 libtinfo6:i386 libtinfo5:i386 libsdl2-2.0-0:i386 libssl3:i386; \
4444
;; \
4545
arm64) \
4646
dpkg --add-architecture armhf; \
4747
apt-get update; \
48-
apt-get install -y --no-install-recommends \
48+
apt-get install -y \
4949
# Required for steamcmd
5050
libgcc-s1:armhf \
5151
# Others
5252
libstdc++6:armhf zlib1g:armhf libbz2-1.0:armhf libcurl4:armhf libcurl3-gnutls:armhf libcurl4-gnutls-dev:armhf \
53-
libncurses6:armhf libncurses5:armhf libtinfo6:armhf libtinfo5:armhf libsdl2-2.0-0:armhf libssl-dev:armhf; \
53+
libncurses6:armhf libncurses5:armhf libtinfo6:armhf libtinfo5:armhf libsdl2-2.0-0:armhf libssl3:armhf; \
5454
# Add box86/box64
5555
install -d -m 0755 /etc/apt/keyrings; \
5656
wget -qO- "https://pi-apps-coders.github.io/box86-debs/KEY.gpg" | gpg --dearmor -o /etc/apt/keyrings/box86-archive-keyring.gpg; \
@@ -67,7 +67,7 @@ RUN set -eux; \
6767
amd64) wget -qO libssl1.1.deb https://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.0g-2ubuntu4_amd64.deb;; \
6868
arm64) wget -qO libssl1.1.deb https://ports.ubuntu.com/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_arm64.deb;; \
6969
esac; \
70-
apt-get install -y --no-install-recommends ./libssl1.1.deb; \
70+
apt-get install -y ./libssl1.1.deb; \
7171
rm libssl1.1.deb; \
7272
# Install AMP instance manager
7373
case "$TARGETARCH" in \

java/lts/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ ARG DEBIAN_FRONTEND=noninteractive
1010
# Install required packages and Temurin Java LTS versions
1111
RUN set -eux; \
1212
apt-get update; \
13-
apt-get install -y --no-install-recommends fontconfig fonts-dejavu-core; \
13+
# Add dependencies as per official Adoptium images
14+
apt-get install -y --no-install-recommends fontconfig binutils p11-kit; \
1415
install -d -m 0755 /etc/apt/keyrings; \
1516
wget -qO- https://packages.adoptium.net/artifactory/api/gpg/key/public | gpg --dearmor -o /etc/apt/keyrings/adoptium.gpg; \
16-
echo "deb [signed-by=/etc/apt/keyrings/adoptium.gpg] https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list >/dev/null; \
17+
printf 'Types: deb\nURIs: https://packages.adoptium.net/artifactory/deb\nSuites: bookworm\nComponents: main\nSigned-By: /etc/apt/keyrings/adoptium.gpg\n' | tee /etc/apt/sources.list.d/adoptium.sources >/dev/null; \
1718
apt-get update; \
1819
apt-get install -y temurin-8-jdk temurin-11-jdk temurin-17-jdk temurin-21-jdk; \
1920
apt-get clean; \

mono/latest/Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@ ARG DEBIAN_FRONTEND=noninteractive
99

1010
# Install required packages and Mono
1111
RUN set -eux; \
12-
apt-get update; \
13-
apt-get install -y --no-install-recommends dirmngr; \
1412
install -d -m 0755 /etc/apt/keyrings; \
15-
gpg --homedir /tmp --no-default-keyring --keyring /etc/apt/keyrings/mono-official-archive-keyring.gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF; \
16-
echo "deb [signed-by=/etc/apt/keyrings/mono-official-archive-keyring.gpg] https://download.mono-project.com/repo/debian stable-buster main" | tee /etc/apt/sources.list.d/mono-official-stable.list >/dev/null; \
13+
wget -qO /etc/apt/keyrings/mono-official-archive-keyring.gpg https://download.mono-project.com/repo/xamarin.gpg; \
14+
printf 'Types: deb\nURIs: https://download.mono-project.com/repo/debian\nSuites: stable-buster\nComponents: main\nSigned-By: /etc/apt/keyrings/mono-official-archive-keyring.gpg\n' | tee /etc/apt/sources.list.d/mono-official-stable.sources >/dev/null; \
1715
apt-get update; \
1816
apt-get install -y mono-complete; \
1917
apt-get clean; \

0 commit comments

Comments
 (0)