From 1b18df3c834c5c4166e99f731d53ec88d14caf7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Sat, 22 Jan 2022 06:04:41 +0100 Subject: [PATCH] Remove deprecated library from Dockerfile (#3420) * Update Dockerfile * Remove zlib1g:i386 from general.sh as well --- config/templates/Dockerfile | 3 +-- lib/general.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/config/templates/Dockerfile b/config/templates/Dockerfile index 08fb8bcc5..4002f9ac8 100644 --- a/config/templates/Dockerfile +++ b/config/templates/Dockerfile @@ -15,8 +15,7 @@ RUN sh -c " \ lib32ncurses6 \ lib32stdc++6 \ lib32tinfo6 \ - libc6-i386 \ - zlib1g:i386; \ + libc6-i386; \ fi" RUN apt-get update \ && apt-get -y upgrade \ diff --git a/lib/general.sh b/lib/general.sh index b1ea66dec..882eacbed 100644 --- a/lib/general.sh +++ b/lib/general.sh @@ -1371,7 +1371,7 @@ prepare_host() if [[ $(dpkg --print-architecture) == amd64 ]]; then - hostdeps+=" distcc lib32ncurses-dev lib32stdc++6 libc6-i386 zlib1g:i386" + hostdeps+=" distcc lib32ncurses-dev lib32stdc++6 libc6-i386" grep -q i386 <(dpkg --print-foreign-architectures) || dpkg --add-architecture i386 elif [[ $(dpkg --print-architecture) == arm64 ]]; then