Skip to content

Commit 3766511

Browse files
dockerfile: install systemd libs from normal repo
Signed-off-by: Patrick Stephens <pat@fluent.do>
1 parent 77d82bc commit 3766511

1 file changed

Lines changed: 23 additions & 22 deletions

File tree

dockerfiles/Dockerfile

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ RUN mkdir -p /fluent-bit/bin /fluent-bit/etc /fluent-bit/log
3535
ENV DEBIAN_FRONTEND=noninteractive
3636

3737
# hadolint ignore=DL3008
38-
RUN echo "deb http://deb.debian.org/debian trixie-backports main" >> /etc/apt/sources.list && \
39-
apt-get update && \
38+
RUN apt-get update && \
4039
apt-get install -y --no-install-recommends \
4140
build-essential \
4241
curl \
@@ -48,7 +47,7 @@ RUN echo "deb http://deb.debian.org/debian trixie-backports main" >> /etc/apt/so
4847
libcurl4-openssl-dev \
4948
libsasl2-dev \
5049
pkg-config \
51-
libsystemd-dev/trixie-backports \
50+
libsystemd-dev \
5251
zlib1g-dev \
5352
libpq-dev \
5453
postgresql-server-dev-all \
@@ -127,20 +126,20 @@ COPY --from=qemu-arm64 /usr/bin/qemu-aarch64-static /usr/bin/
127126
# We also include some extra handling for the status files that some tooling uses for scanning, etc.
128127
WORKDIR /tmp
129128
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
130-
RUN echo "deb http://deb.debian.org/debian trixie-backports main" >> /etc/apt/sources.list && \
131-
apt-get update && \
129+
RUN apt-get update && \
132130
apt-get download \
133-
libssl3 \
134-
libcurl4 \
131+
libssl3t64 \
132+
libcurl4t64 \
135133
libnghttp2-14 \
134+
libnghttp3-9 \
136135
librtmp1 \
137-
libssh2-1 \
138-
libpsl5 \
136+
libssh2-1t64 \
137+
libpsl5t64 \
139138
libbrotli1 \
140139
libsasl2-2 \
141140
pkg-config \
142141
libpq5 \
143-
libsystemd0/trixie-backports \
142+
libsystemd0 \
144143
zlib1g \
145144
ca-certificates \
146145
libatomic1 \
@@ -154,19 +153,20 @@ RUN echo "deb http://deb.debian.org/debian trixie-backports main" >> /etc/apt/so
154153
libk5crypto3 \
155154
libcom-err2 \
156155
libkrb5support0 \
157-
libgnutls30 \
156+
libgnutls30t64 \
158157
libkeyutils1 \
159158
libp11-kit0 \
160159
libidn2-0 \
161-
libunistring2 \
160+
libunistring5 \
162161
libtasn1-6 \
163-
libnettle8 \
164-
libhogweed6 \
162+
libnettle8t64 \
163+
libhogweed6t64 \
165164
libgmp10 \
166165
libffi8 \
167166
liblzma5 \
168167
libyaml-0-2 \
169168
libcap2 \
169+
libldap2 \
170170
&& \
171171
mkdir -p /dpkg/var/lib/dpkg/status.d/ && \
172172
for deb in *.deb; do \
@@ -234,25 +234,26 @@ COPY --from=qemu-arm64 /usr/bin/qemu-aarch64-static /usr/bin/
234234
ENV DEBIAN_FRONTEND=noninteractive
235235

236236
# hadolint ignore=DL3008
237-
RUN echo "deb http://deb.debian.org/debian trixie-backports main" >> /etc/apt/sources.list && \
238-
apt-get update && \
237+
RUN apt-get update && \
239238
apt-get install -y --no-install-recommends \
240-
libssl3 \
241-
libcurl4 \
239+
libssl3t64 \
240+
libcurl4t64 \
242241
libnghttp2-14 \
242+
libnghttp3-9 \
243243
librtmp1 \
244-
libssh2-1 \
245-
libpsl5 \
244+
libssh2-1t64 \
245+
libpsl5t64 \
246246
libbrotli1 \
247247
libsasl2-2 \
248248
pkg-config \
249249
libpq5 \
250-
libsystemd0/trixie-backports \
250+
libsystemd0 \
251251
zlib1g \
252252
ca-certificates \
253253
libatomic1 \
254254
libgcrypt20 \
255255
libyaml-0-2 \
256+
libldap2 \
256257
bash gdb valgrind build-essential \
257258
git bash-completion vim tmux jq \
258259
dnsutils iputils-ping iputils-arping iputils-tracepath iputils-clockdiff \
@@ -261,7 +262,7 @@ RUN echo "deb http://deb.debian.org/debian trixie-backports main" >> /etc/apt/so
261262
openssl \
262263
htop atop strace iotop sysstat ncdu logrotate hdparm pciutils psmisc tree pv \
263264
make tar flex bison \
264-
libssl-dev libsasl2-dev libsystemd-dev/trixie-backports zlib1g-dev libpq-dev libyaml-dev postgresql-server-dev-all \
265+
libssl-dev libsasl2-dev libsystemd-dev zlib1g-dev libpq-dev libyaml-dev postgresql-server-dev-all \
265266
&& apt-get satisfy -y cmake "cmake (<< 4.0)" \
266267
&& apt-get clean \
267268
&& rm -rf /var/lib/apt/lists/*

0 commit comments

Comments
 (0)