Move libcairo to all architectures in docker (#5276)

This commit is contained in:
Jesse Hills 2023-08-18 19:13:46 +12:00 committed by GitHub
parent c287e529a8
commit f16a24ddf4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -28,14 +28,14 @@ RUN \
git=1:2.30.2-1+deb11u2 \ git=1:2.30.2-1+deb11u2 \
curl=7.74.0-1.3+deb11u7 \ curl=7.74.0-1.3+deb11u7 \
openssh-client=1:8.4p1-5+deb11u1 \ openssh-client=1:8.4p1-5+deb11u1 \
python3-cffi=1.14.5-1; \ python3-cffi=1.14.5-1 \
libcairo2=1.16.0-5; \
if [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]; then \ if [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]; then \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
build-essential=12.9 \ build-essential=12.9 \
python3-dev=3.9.2-3 \ python3-dev=3.9.2-3 \
zlib1g-dev=1:1.2.11.dfsg-2+deb11u2 \ zlib1g-dev=1:1.2.11.dfsg-2+deb11u2 \
libjpeg-dev=1:2.0.6-4 \ libjpeg-dev=1:2.0.6-4 \
libcairo2=1.16.0-5 \
libfreetype-dev=2.10.4+dfsg-1+deb11u1; \ libfreetype-dev=2.10.4+dfsg-1+deb11u1; \
fi; \ fi; \
rm -rf \ rm -rf \