Skip to content

Commit fbd970b

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

File tree

1 file changed

+20
-23
lines changed

1 file changed

+20
-23
lines changed

dockerfiles/Dockerfile

Lines changed: 20 additions & 23 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 \
@@ -122,20 +121,18 @@ COPY --from=qemu-arm64 /usr/bin/qemu-aarch64-static /usr/bin/
122121
# We also include some extra handling for the status files that some tooling uses for scanning, etc.
123122
WORKDIR /tmp
124123
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
125-
RUN echo "deb http://deb.debian.org/debian trixie-backports main" >> /etc/apt/sources.list && \
126-
apt-get update && \
124+
RUN apt-get update && \
127125
apt-get download \
128-
libssl3 \
129-
libcurl4 \
126+
libssl3t64 \
127+
libcurl4t64 \
130128
libnghttp2-14 \
131129
librtmp1 \
132-
libssh2-1 \
133-
libpsl5 \
130+
libssh2-1t64 \
131+
libpsl5t64 \
134132
libbrotli1 \
135133
libsasl2-2 \
136134
pkg-config \
137-
libpq5 \
138-
libsystemd0/trixie-backports \
135+
libsystemd0 \
139136
zlib1g \
140137
ca-certificates \
141138
libatomic1 \
@@ -149,14 +146,14 @@ RUN echo "deb http://deb.debian.org/debian trixie-backports main" >> /etc/apt/so
149146
libk5crypto3 \
150147
libcom-err2 \
151148
libkrb5support0 \
152-
libgnutls30 \
149+
libgnutls30t64 \
153150
libkeyutils1 \
154151
libp11-kit0 \
155152
libidn2-0 \
156-
libunistring2 \
153+
libunistring5 \
157154
libtasn1-6 \
158-
libnettle8 \
159-
libhogweed6 \
155+
libnettle8t64 \
156+
libhogweed6t64 \
160157
libgmp10 \
161158
libffi8 \
162159
liblzma5 \
@@ -229,20 +226,20 @@ COPY --from=qemu-arm64 /usr/bin/qemu-aarch64-static /usr/bin/
229226
ENV DEBIAN_FRONTEND=noninteractive
230227

231228
# hadolint ignore=DL3008
232-
RUN echo "deb http://deb.debian.org/debian trixie-backports main" >> /etc/apt/sources.list && \
233-
apt-get update && \
229+
RUN apt-get update && \
234230
apt-get install -y --no-install-recommends \
235-
libssl3 \
236-
libcurl4 \
231+
libssl3t64 \
232+
libcurl4t64 \
237233
libnghttp2-14 \
234+
libnghttp3-9 \
238235
librtmp1 \
239-
libssh2-1 \
240-
libpsl5 \
236+
libssh2-1t64 \
237+
libpsl5t64 \
241238
libbrotli1 \
242239
libsasl2-2 \
243240
pkg-config \
244241
libpq5 \
245-
libsystemd0/trixie-backports \
242+
libsystemd0 \
246243
zlib1g \
247244
ca-certificates \
248245
libatomic1 \
@@ -256,7 +253,7 @@ RUN echo "deb http://deb.debian.org/debian trixie-backports main" >> /etc/apt/so
256253
openssl \
257254
htop atop strace iotop sysstat ncdu logrotate hdparm pciutils psmisc tree pv \
258255
make tar flex bison \
259-
libssl-dev libsasl2-dev libsystemd-dev/trixie-backports zlib1g-dev libpq-dev libyaml-dev postgresql-server-dev-all \
256+
libssl-dev libsasl2-dev libsystemd-dev zlib1g-dev libpq-dev libyaml-dev postgresql-server-dev-all \
260257
&& apt-get satisfy -y cmake "cmake (<< 4.0)" \
261258
&& apt-get clean \
262259
&& rm -rf /var/lib/apt/lists/*

0 commit comments

Comments
 (0)