JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated library from Dockerfile (#3420)

Browse Source 
* Update Dockerfile
* Remove zlib1g:i386 from general.sh as well
This commit is contained in:
Igor Pečovnik
2022-01-22 06:04:41 +01:00
committed by GitHub
parent e610f00bc7
commit 1b18df3c83
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/templates/Dockerfile
View File

@@ -15,8 +15,7 @@ RUN sh -c " \
lib32ncurses6 \ lib32ncurses6 \
lib32stdc++6 \ lib32stdc++6 \
lib32tinfo6 \ lib32tinfo6 \
libc6-i386 \ libc6-i386; \
zlib1g:i386; \
fi" fi"
RUN apt-get update \ RUN apt-get update \
&& apt-get -y upgrade \ && apt-get -y upgrade \

2
lib/general.sh
View File

@@ -1371,7 +1371,7 @@ prepare_host()
if [[ $(dpkg --print-architecture) == amd64 ]]; then 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 grep -q i386 <(dpkg --print-foreign-architectures) || dpkg --add-architecture i386
elif [[ $(dpkg --print-architecture) == arm64 ]]; then elif [[ $(dpkg --print-architecture) == arm64 ]]; then