Skip to content

Commit b7bfe38

Browse files
committed
apt cleanup from illwieckz
1 parent 532e630 commit b7bfe38

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

Dockerfile

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ ENV LANG=C.UTF-8
66

77
# OpenSSL build requires perl
88
# Qt tarball requires xz-utils
9-
# Qt build requires libgl1-mesa-dev, libxkbcommon-dev, python, zlib1g-dev
10-
# Qt configuration additionally finds libxcb-glx0-dev/libx11-xcb-dev/libxext-dev. Without them, the
11-
# updater builds but icons (gear, download, etc.) are mysteriously missing, when built in the
12-
# Bullseye environment. It may be that not all are necessary.
9+
# Qt build requires libgl1-mesa-dev, libxkbcommon-dev, python, zlib1g-dev................
1310
# aria2 build requires autoconf, autopoint, gettext
1411
# git is used for cleaning unwanted files
12+
13+
# For Qt's xcb_syslibs compile test
1514
ENV XCB_MINIMUM_PACKAGES=' \
1615
libxcb-cursor-dev \
1716
libxcb-icccm4-dev \
@@ -27,10 +26,12 @@ ENV XCB_MINIMUM_PACKAGES=' \
2726
libxcb-xkb-dev \
2827
libxcb-util-dev \
2928
'
29+
RUN echo 'deb http://archive.debian.org/debian bullseye-backports main' > /etc/apt/sources.list.d/backports.list
3030
RUN apt-get update && apt-get install -y \
3131
autoconf \
3232
autopoint \
33-
ca-certificates \
33+
cmake/bullseye-backports \
34+
cmake-data/bullseye-backports \
3435
curl \
3536
gettext \
3637
git \
@@ -48,9 +49,7 @@ RUN apt-get update && apt-get install -y \
4849
python \
4950
xz-utils \
5051
zlib1g-dev \
51-
$XCB_MINIMUM_PACKAGES && \
52-
echo 'deb https://archive.debian.org/debian bullseye-backports main' > /etc/apt/sources.list.d/backports.list && \
53-
apt-get update && apt-get install -y cmake/bullseye-backports
52+
$XCB_MINIMUM_PACKAGES
5453
RUN rm /usr/lib/x86_64-linux-gnu/libxcb-*.so
5554

5655
#################

0 commit comments

Comments
 (0)