From 3e3fe3454d09b622f0faee39bb6224892b46cbaa Mon Sep 17 00:00:00 2001 From: LucidityCrash Date: Wed, 31 May 2023 13:26:53 +0000 Subject: [PATCH 1/2] use latest official promtail --- promtail/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/promtail/Dockerfile b/promtail/Dockerfile index 0f6419f..3834e82 100644 --- a/promtail/Dockerfile +++ b/promtail/Dockerfile @@ -1,8 +1,8 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:6.2.7 ARG BUILD_ARCH=amd64 # https://github.com/mdegat01/promtail-journal/releases -FROM ghcr.io/mdegat01/promtail-journal/${BUILD_ARCH}:1.6.0 as build_promtail +#FROM ghcr.io/mdegat01/promtail-journal/${BUILD_ARCH}:1.6.0 as build_promtail # https://github.com/hassio-addons/addon-debian-base/releases # hadolint ignore=DL3006 @@ -17,7 +17,7 @@ RUN set -eux; \ apt-get update; \ apt-get install -qy --no-install-recommends \ tar=1.34+dfsg-1 \ - libsystemd-dev=247.3-7+deb11u1 \ + libsystemd-dev \ ; \ update-ca-certificates; \ \ @@ -40,7 +40,7 @@ RUN set -eux; \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*; # Add promtail -COPY --from=build_promtail /usr/bin/promtail /usr/bin/promtail +COPY --from=grafana/promtail:latest /usr/bin/promtail /usr/bin/promtail RUN promtail --version COPY rootfs / From 4669c31fc85cf87591257593c07ef7d704f04e88 Mon Sep 17 00:00:00 2001 From: LucidityCrash Date: Thu, 1 Jun 2023 07:59:43 +0000 Subject: [PATCH 2/2] Getting Backports systemd-dev --- promtail/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/promtail/Dockerfile b/promtail/Dockerfile index 3834e82..b12df9f 100644 --- a/promtail/Dockerfile +++ b/promtail/Dockerfile @@ -13,11 +13,12 @@ ARG BUILD_ARCH=amd64 ARG YQ_VERSION=4.27.3 # Add yq and tzdata (required for the timestamp stage) +RUN echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/sources.list +RUN apt-get update && apt-get install -t bullseye-backports -qy libsystemd-dev RUN set -eux; \ apt-get update; \ apt-get install -qy --no-install-recommends \ tar=1.34+dfsg-1 \ - libsystemd-dev \ ; \ update-ca-certificates; \ \