Skip to content

Commit 6110b14

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

File tree

1 file changed

+21
-22
lines changed

1 file changed

+21
-22
lines changed

dockerfiles/Dockerfile

Lines changed: 21 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 \
@@ -122,20 +121,20 @@ 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 \
129+
libnghttp3-9 \
131130
librtmp1 \
132-
libssh2-1 \
133-
libpsl5 \
131+
libssh2-1t64 \
132+
libpsl5t64 \
134133
libbrotli1 \
135134
libsasl2-2 \
136135
pkg-config \
137136
libpq5 \
138-
libsystemd0/trixie-backports \
137+
libsystemd0 \
139138
zlib1g \
140139
ca-certificates \
141140
libatomic1 \
@@ -149,14 +148,14 @@ RUN echo "deb http://deb.debian.org/debian trixie-backports main" >> /etc/apt/so
149148
libk5crypto3 \
150149
libcom-err2 \
151150
libkrb5support0 \
152-
libgnutls30 \
151+
libgnutls30t64 \
153152
libkeyutils1 \
154153
libp11-kit0 \
155154
libidn2-0 \
156-
libunistring2 \
155+
libunistring5 \
157156
libtasn1-6 \
158-
libnettle8 \
159-
libhogweed6 \
157+
libnettle8t64 \
158+
libhogweed6t64 \
160159
libgmp10 \
161160
libffi8 \
162161
liblzma5 \
@@ -229,20 +228,20 @@ COPY --from=qemu-arm64 /usr/bin/qemu-aarch64-static /usr/bin/
229228
ENV DEBIAN_FRONTEND=noninteractive
230229

231230
# hadolint ignore=DL3008
232-
RUN echo "deb http://deb.debian.org/debian trixie-backports main" >> /etc/apt/sources.list && \
233-
apt-get update && \
231+
RUN apt-get update && \
234232
apt-get install -y --no-install-recommends \
235-
libssl3 \
236-
libcurl4 \
233+
libssl3t64 \
234+
libcurl4t64 \
237235
libnghttp2-14 \
236+
libnghttp3-9 \
238237
librtmp1 \
239-
libssh2-1 \
240-
libpsl5 \
238+
libssh2-1t64 \
239+
libpsl5t64 \
241240
libbrotli1 \
242241
libsasl2-2 \
243242
pkg-config \
244243
libpq5 \
245-
libsystemd0/trixie-backports \
244+
libsystemd0 \
246245
zlib1g \
247246
ca-certificates \
248247
libatomic1 \
@@ -256,7 +255,7 @@ RUN echo "deb http://deb.debian.org/debian trixie-backports main" >> /etc/apt/so
256255
openssl \
257256
htop atop strace iotop sysstat ncdu logrotate hdparm pciutils psmisc tree pv \
258257
make tar flex bison \
259-
libssl-dev libsasl2-dev libsystemd-dev/trixie-backports zlib1g-dev libpq-dev libyaml-dev postgresql-server-dev-all \
258+
libssl-dev libsasl2-dev libsystemd-dev zlib1g-dev libpq-dev libyaml-dev postgresql-server-dev-all \
260259
&& apt-get satisfy -y cmake "cmake (<< 4.0)" \
261260
&& apt-get clean \
262261
&& rm -rf /var/lib/apt/lists/*

0 commit comments

Comments
 (0)