diff --git a/clients/cmd/promtail/Dockerfile b/clients/cmd/promtail/Dockerfile index 856e7d60e2f5d..e7bc3a847d529 100644 --- a/clients/cmd/promtail/Dockerfile +++ b/clients/cmd/promtail/Dockerfile @@ -7,16 +7,13 @@ RUN echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/ RUN apt-get update && apt-get install -t bullseye-backports -qy libsystemd-dev RUN make clean && make BUILD_IN_CONTAINER=false PROMTAIL_JOURNAL_ENABLED=true promtail -# Promtail requires debian as the base image to support systemd journal reading -FROM debian:bullseye-slim +# Promtail requires debian or ubuntu as the base image to support systemd journal reading +FROM public.ecr.aws/ubuntu/ubuntu:noble # tzdata required for the timestamp stage to work -# Backports repo required to get a libsystemd version 246 or newer which is required to handle journal +ZSTD compression -RUN echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/sources.list -RUN apt-get update && \ - apt-get install -qy \ - tzdata ca-certificates -RUN apt-get install -t bullseye-backports -qy libsystemd-dev && \ - rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* +# Install dependencies needed at runtime. +RUN apt-get update \ + && apt-get install -qy libsystemd-dev tzdata ca-certificates \ + && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* COPY --from=build /src/loki/clients/cmd/promtail/promtail /usr/bin/promtail COPY clients/cmd/promtail/promtail-docker-config.yaml /etc/promtail/config.yml ENTRYPOINT ["/usr/bin/promtail"] diff --git a/clients/cmd/promtail/Dockerfile.arm32 b/clients/cmd/promtail/Dockerfile.arm32 index ca47e3178c921..cb5c7dbe5f7e2 100644 --- a/clients/cmd/promtail/Dockerfile.arm32 +++ b/clients/cmd/promtail/Dockerfile.arm32 @@ -7,8 +7,8 @@ RUN echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/ RUN apt-get update && apt-get install -t bullseye-backports -qy libsystemd-dev RUN make clean && make BUILD_IN_CONTAINER=false PROMTAIL_JOURNAL_ENABLED=true promtail -# Promtail requires debian as the base image to support systemd journal reading -FROM debian:bullseye-slim +# Promtail requires debian or ubuntu as the base image to support systemd journal reading +FROM public.ecr.aws/ubuntu/ubuntu:noble # tzdata required for the timestamp stage to work # Backports repo required to get a libsystemd version 246 or newer which is required to handle journal +ZSTD compression RUN echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/sources.list diff --git a/clients/cmd/promtail/Dockerfile.cross b/clients/cmd/promtail/Dockerfile.cross index 4352b89e743b0..4fb00961dc349 100644 --- a/clients/cmd/promtail/Dockerfile.cross +++ b/clients/cmd/promtail/Dockerfile.cross @@ -12,8 +12,8 @@ COPY . /src/loki WORKDIR /src/loki RUN make clean && GOARCH=$(cat /goarch) GOARM=$(cat /goarm) make BUILD_IN_CONTAINER=false PROMTAIL_JOURNAL_ENABLED=true promtail -# Promtail requires debian as the base image to support systemd journal reading -FROM debian:stretch-slim +# Promtail requires debian or ubuntu as the base image to support systemd journal reading +FROM public.ecr.aws/ubuntu/ubuntu:noble # tzdata required for the timestamp stage to work RUN apt-get update && \ apt-get install -qy \