Skip to content

Commit ae1fb5a

Browse files
cstyantrevorwhitney
authored andcommitted
fix: switch promtails base image from debian to ubuntu (backport release-2.9.x) (#15210)
1 parent 2188a35 commit ae1fb5a

File tree

3 files changed

+10
-13
lines changed

3 files changed

+10
-13
lines changed

clients/cmd/promtail/Dockerfile

+6-9
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,13 @@ RUN echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/
77
RUN apt-get update && apt-get install -t bullseye-backports -qy libsystemd-dev
88
RUN make clean && make BUILD_IN_CONTAINER=false PROMTAIL_JOURNAL_ENABLED=true promtail
99

10-
# Promtail requires debian as the base image to support systemd journal reading
11-
FROM debian:bullseye-slim
10+
# Promtail requires debian or ubuntu as the base image to support systemd journal reading
11+
FROM public.ecr.aws/ubuntu/ubuntu:noble
1212
# tzdata required for the timestamp stage to work
13-
# Backports repo required to get a libsystemd version 246 or newer which is required to handle journal +ZSTD compression
14-
RUN echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/sources.list
15-
RUN apt-get update && \
16-
apt-get install -qy \
17-
tzdata ca-certificates
18-
RUN apt-get install -t bullseye-backports -qy libsystemd-dev && \
19-
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
13+
# Install dependencies needed at runtime.
14+
RUN apt-get update \
15+
&& apt-get install -qy libsystemd-dev tzdata ca-certificates \
16+
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
2017
COPY --from=build /src/loki/clients/cmd/promtail/promtail /usr/bin/promtail
2118
COPY clients/cmd/promtail/promtail-docker-config.yaml /etc/promtail/config.yml
2219
ENTRYPOINT ["/usr/bin/promtail"]

clients/cmd/promtail/Dockerfile.arm32

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ RUN echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/
77
RUN apt-get update && apt-get install -t bullseye-backports -qy libsystemd-dev
88
RUN make clean && make BUILD_IN_CONTAINER=false PROMTAIL_JOURNAL_ENABLED=true promtail
99

10-
# Promtail requires debian as the base image to support systemd journal reading
11-
FROM debian:bullseye-slim
10+
# Promtail requires debian or ubuntu as the base image to support systemd journal reading
11+
FROM public.ecr.aws/ubuntu/ubuntu:noble
1212
# tzdata required for the timestamp stage to work
1313
# Backports repo required to get a libsystemd version 246 or newer which is required to handle journal +ZSTD compression
1414
RUN echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/sources.list

clients/cmd/promtail/Dockerfile.cross

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ COPY . /src/loki
1212
WORKDIR /src/loki
1313
RUN make clean && GOARCH=$(cat /goarch) GOARM=$(cat /goarm) make BUILD_IN_CONTAINER=false PROMTAIL_JOURNAL_ENABLED=true promtail
1414

15-
# Promtail requires debian as the base image to support systemd journal reading
16-
FROM debian:stretch-slim
15+
# Promtail requires debian or ubuntu as the base image to support systemd journal reading
16+
FROM public.ecr.aws/ubuntu/ubuntu:noble
1717
# tzdata required for the timestamp stage to work
1818
RUN apt-get update && \
1919
apt-get install -qy \

0 commit comments

Comments
 (0)