diff --git a/dockerfiles/Dockerfile.arm32v7 b/dockerfiles/Dockerfile.arm32v7 index 6a5088d3a3a..7871ee6d59d 100644 --- a/dockerfiles/Dockerfile.arm32v7 +++ b/dockerfiles/Dockerfile.arm32v7 @@ -14,7 +14,8 @@ RUN mkdir -p /fluent-bit/bin /fluent-bit/etc /fluent-bit/log /tmp/fluent-bit-mas ENV DEBIAN_FRONTEND noninteractive -RUN apt-get update && \ +RUN echo "deb http://deb.debian.org/debian buster-backports main" > /etc/apt/sources.list.d/backports.list && \ + apt-get update && \ apt-get install -y --no-install-recommends \ build-essential \ curl \ @@ -25,7 +26,7 @@ RUN apt-get update && \ libssl-dev \ libsasl2-dev \ pkg-config \ - libsystemd-dev \ + libsystemd-dev/buster-backports \ zlib1g-dev \ libpq-dev \ postgresql-server-dev-all \ @@ -70,13 +71,14 @@ FROM arm32v7/debian:buster-slim COPY --from=builder /usr/bin/qemu-arm-static /usr/bin/qemu-arm-static -RUN apt-get update && \ +RUN echo "deb http://deb.debian.org/debian buster-backports main" > /etc/apt/sources.list.d/backports.list && \ + apt-get update && \ apt-get install -y --no-install-recommends \ libssl1.1 \ libsasl2-2 \ pkg-config \ libpq5 \ - libsystemd0 \ + libsystemd0/buster-backports \ zlib1g \ ca-certificates diff --git a/dockerfiles/Dockerfile.arm64v8 b/dockerfiles/Dockerfile.arm64v8 index c9cc47c2800..ea57e49d187 100644 --- a/dockerfiles/Dockerfile.arm64v8 +++ b/dockerfiles/Dockerfile.arm64v8 @@ -10,6 +10,7 @@ ENV FLB_VERSION 1.9.0 ENV DEBIAN_FRONTEND noninteractive RUN dpkg --add-architecture arm64 +RUN echo "deb http://deb.debian.org/debian buster-backports main" > /etc/apt/sources.list.d/backports.list RUN apt update && apt install -y --no-remove --no-install-recommends \ build-essential \ g++-aarch64-linux-gnu \ @@ -23,7 +24,7 @@ RUN apt update && apt install -y --no-remove --no-install-recommends \ dpkg-dev \ libssl-dev:arm64 \ libsasl2-dev:arm64 \ - libsystemd-dev:arm64 \ + libsystemd-dev:arm64/buster-backports \ libzstd-dev:arm64 \ zlib1g-dev:arm64 \ libpq-dev:arm64 diff --git a/dockerfiles/Dockerfile.x86_64 b/dockerfiles/Dockerfile.x86_64 index 36158a599e2..5456fe3fe1d 100644 --- a/dockerfiles/Dockerfile.x86_64 +++ b/dockerfiles/Dockerfile.x86_64 @@ -12,7 +12,8 @@ RUN mkdir -p /fluent-bit/bin /fluent-bit/etc /fluent-bit/log /tmp/fluent-bit-mas ENV DEBIAN_FRONTEND noninteractive -RUN apt-get update && \ +RUN echo "deb http://deb.debian.org/debian buster-backports main" > /etc/apt/sources.list.d/backports.list && \ + apt-get update && \ apt-get install -y --no-install-recommends \ build-essential \ curl \ @@ -23,7 +24,7 @@ RUN apt-get update && \ libssl-dev \ libsasl2-dev \ pkg-config \ - libsystemd-dev \ + libsystemd-dev/buster-backports \ zlib1g-dev \ libpq-dev \ postgresql-server-dev-all \ @@ -77,7 +78,7 @@ COPY --from=builder /usr/lib/x86_64-linux-gnu/libssl.so* /usr/lib/x86_64-linux-g COPY --from=builder /usr/lib/x86_64-linux-gnu/libcrypto.so* /usr/lib/x86_64-linux-gnu/ # These below are all needed for systemd -COPY --from=builder /lib/x86_64-linux-gnu/libsystemd* /lib/x86_64-linux-gnu/ +COPY --from=builder /usr/lib/x86_64-linux-gnu/libsystemd* /usr/lib/x86_64-linux-gnu/ COPY --from=builder /lib/x86_64-linux-gnu/libselinux.so* /lib/x86_64-linux-gnu/ COPY --from=builder /lib/x86_64-linux-gnu/liblzma.so* /lib/x86_64-linux-gnu/ COPY --from=builder /usr/lib/x86_64-linux-gnu/liblz4.so* /usr/lib/x86_64-linux-gnu/ diff --git a/dockerfiles/Dockerfile.x86_64-master b/dockerfiles/Dockerfile.x86_64-master index 8d73028e205..870bec7f51c 100644 --- a/dockerfiles/Dockerfile.x86_64-master +++ b/dockerfiles/Dockerfile.x86_64-master @@ -4,7 +4,8 @@ ENV DEBIAN_FRONTEND noninteractive ADD . /source -RUN apt-get update && \ +RUN echo "deb http://deb.debian.org/debian buster-backports main" > /etc/apt/sources.list.d/backports.list && \ + apt-get update && \ apt-get install -y --no-install-recommends \ build-essential \ curl \ @@ -15,7 +16,7 @@ RUN apt-get update && \ libssl-dev \ libsasl2-dev \ pkg-config \ - libsystemd-dev \ + libsystemd-dev/buster-backports \ zlib1g-dev \ libpq-dev \ postgresql-server-dev-all \ @@ -65,7 +66,7 @@ COPY --from=builder /usr/lib/x86_64-linux-gnu/libssl.so* /usr/lib/x86_64-linux-g COPY --from=builder /usr/lib/x86_64-linux-gnu/libcrypto.so* /usr/lib/x86_64-linux-gnu/ # These below are all needed for systemd -COPY --from=builder /lib/x86_64-linux-gnu/libsystemd* /lib/x86_64-linux-gnu/ +COPY --from=builder /usr/lib/x86_64-linux-gnu/libsystemd* /usr/lib/x86_64-linux-gnu/ COPY --from=builder /lib/x86_64-linux-gnu/libselinux.so* /lib/x86_64-linux-gnu/ COPY --from=builder /lib/x86_64-linux-gnu/liblzma.so* /lib/x86_64-linux-gnu/ COPY --from=builder /usr/lib/x86_64-linux-gnu/liblz4.so* /usr/lib/x86_64-linux-gnu/ diff --git a/dockerfiles/Dockerfile.x86_64-master_debug b/dockerfiles/Dockerfile.x86_64-master_debug index d00ccd0b18a..ca0bfa1ef80 100644 --- a/dockerfiles/Dockerfile.x86_64-master_debug +++ b/dockerfiles/Dockerfile.x86_64-master_debug @@ -4,6 +4,7 @@ ENV DEBIAN_FRONTEND noninteractive ADD . /source +RUN echo "deb http://deb.debian.org/debian buster-backports main" > /etc/apt/sources.list.d/backports.list RUN apt-get update && \ apt-get install -y --no-install-recommends \ build-essential \ @@ -15,7 +16,7 @@ RUN apt-get update && \ libssl-dev \ libsasl2-dev \ pkg-config \ - libsystemd-dev \ + libsystemd-dev/buster-backports \ zlib1g-dev \ libpq-dev \ postgresql-server-dev-all \ @@ -74,7 +75,7 @@ COPY --from=builder /lib/x86_64-linux-gnu/libz* /lib/x86_64-linux-gnu/ COPY --from=builder /usr/lib/x86_64-linux-gnu/libssl.so* /usr/lib/x86_64-linux-gnu/ COPY --from=builder /usr/lib/x86_64-linux-gnu/libcrypto.so* /usr/lib/x86_64-linux-gnu/ # These below are all needed for systemd -COPY --from=builder /lib/x86_64-linux-gnu/libsystemd* /lib/x86_64-linux-gnu/ +COPY --from=builder /usr/lib/x86_64-linux-gnu/libsystemd* /usr/lib/x86_64-linux-gnu/ COPY --from=builder /lib/x86_64-linux-gnu/libselinux.so* /lib/x86_64-linux-gnu/ COPY --from=builder /lib/x86_64-linux-gnu/liblzma.so* /lib/x86_64-linux-gnu/ COPY --from=builder /usr/lib/x86_64-linux-gnu/liblz4.so* /usr/lib/x86_64-linux-gnu/