From 6c9c70962c660550895bad7762a103f3408629dd Mon Sep 17 00:00:00 2001
From: mezned <meznedf@gmail.com>
Date: Sun, 10 Nov 2024 10:32:23 +0100
Subject: [PATCH] update promtail

---
 promtail/Dockerfile | 21 +++++++++------------
 promtail/build.yaml |  8 ++++----
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/promtail/Dockerfile b/promtail/Dockerfile
index 7c6712d..e0eb905 100644
--- a/promtail/Dockerfile
+++ b/promtail/Dockerfile
@@ -1,6 +1,3 @@
-# https://github.com/mdegat01/promtail-journal/releases
-#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
 ARG BUILD_FROM
@@ -11,16 +8,17 @@ ARG YQ_VERSION=4.44.3
 
 ARG BUILD_ARCH
 # 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 \
-        ; \
-    update-ca-certificates; \
+    apk update; \
     \
-    case "${BUILD_ARCH}" in \
+    apk add --no-cache --virtual .build-deps \
+        libsystemd-dev \
+        tar \
+        ca-certificates \
+        ; \
+    APKARCH="$(apk --print-arch)"; \
+RUN update-ca-certificates;
+RUN case "${BUILD_ARCH}" in \
         amd64)  BINARCH='amd64' ;; \
         armhf)   BINARCH='arm' ;; \
         armv7)   BINARCH='arm' ;; \
@@ -35,7 +33,6 @@ RUN set -eux; \
     rm /tmp/yq.tar.gz; \
     yq --version; \
     \
-    apt-get clean; \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*; \
     chmod +x /etc/cont-init.d/promtail_setup.sh; \
     chmod +x /etc/services.d/promtail/*;
diff --git a/promtail/build.yaml b/promtail/build.yaml
index be4d420..1a9f6a3 100644
--- a/promtail/build.yaml
+++ b/promtail/build.yaml
@@ -1,9 +1,9 @@
 ---
 build_from:
-  amd64: ghcr.io/hassio-addons/debian-base/amd64:7.5.1
-  armhf: ghcr.io/hassio-addons/debian-base/armhf:7.5.1
-  armv7: ghcr.io/hassio-addons/debian-base/armv7:7.5.1
-  aarch64: ghcr.io/hassio-addons/debian-base/aarch64:7.5.1
+  amd64: ghcr.io/hassio-addons/base/amd64:16.3.4
+  armhf: ghcr.io/hassio-addons/base/armhf:16.3.4
+  armv7: ghcr.io/hassio-addons/base/armv7:16.3.4
+  aarch64: ghcr.io/hassio-addons/base/aarch64:16.3.4
 codenotary:
   base_image: codenotary@frenck.dev
   signer: codenotary@degatano.com