From 0403ccf7b410de5646d3d0ea7c6cc18a57a063f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franc=CC=A7ois=20Bonelle?= <francois.bonelle@gmail.com>
Date: Sat, 18 Jun 2022 19:12:06 +0200
Subject: [PATCH] fix

---
 telegraf/Dockerfile | 74 +++++++++++++++++++++------------------------
 telegraf/build.yaml | 10 +++---
 2 files changed, 40 insertions(+), 44 deletions(-)

diff --git a/telegraf/Dockerfile b/telegraf/Dockerfile
index 3ae1358..4b23f42 100755
--- a/telegraf/Dockerfile
+++ b/telegraf/Dockerfile
@@ -1,45 +1,6 @@
 ARG BUILD_FROM
 FROM ${BUILD_FROM}
 
-ARG BUILD_ARCH
-ARG TELEGRAF_VERSION
-
-RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
-RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors tzdata su-exec libcap && \
-    update-ca-certificates
-
-ENV TELEGRAF_VERSION ${TELEGRAF_VERSION}
-
-RUN set -ex && \
-    mkdir ~/.gnupg; \
-    echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
-    apk add --no-cache --virtual .build-deps wget gnupg tar && \
-    for key in \
-        05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
-    do \
-        gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
-    done && \
-    wget --no-verbose https://dl.influxdata.com/telegraf/releases/telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz.asc && \
-    wget --no-verbose https://dl.influxdata.com/telegraf/releases/telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz && \
-    gpg --batch --verify telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz.asc telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz && \
-    mkdir -p /usr/src /etc/telegraf && \
-    tar -C /usr/src -xzf telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz && \
-    mv /usr/src/telegraf*/etc/telegraf/telegraf.conf /etc/telegraf/ && \
-    mkdir /etc/telegraf/telegraf.d && \
-    cp -a /usr/src/telegraf*/usr/bin/telegraf /usr/bin/ && \
-    gpgconf --kill all && \
-    rm -rf *.tar.gz* /usr/src /root/.gnupg && \
-    apk del .build-deps && \
-    addgroup -S telegraf && \
-    adduser -S telegraf -G telegraf && \
-    chown -R telegraf:telegraf /etc/telegraf
-
-EXPOSE 8125/udp 8092/udp 8094
-
-COPY entrypoint.sh /entrypoint.sh
-ENTRYPOINT ["/entrypoint.sh"]
-CMD ["telegraf"]
-
 # Build arguments
 ARG BUILD_ARCH
 ARG BUILD_DATE
@@ -48,6 +9,41 @@ ARG BUILD_NAME
 ARG BUILD_REF
 ARG BUILD_REPOSITORY
 ARG BUILD_VERSION
+ARG TELEGRAF_VERSION
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends iputils-ping snmp procps lm-sensors libcap2-bin && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN set -ex && \
+    mkdir ~/.gnupg; \
+    echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
+    for key in \
+        05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
+    do \
+        gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
+    done
+
+ENV TELEGRAF_VERSION ${TELEGRAF_VERSION}
+RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
+    case "${dpkgArch##*-}" in \
+      amd64) ARCH='amd64';; \
+      arm64) ARCH='arm64';; \
+      armhf) ARCH='armhf';; \
+      armel) ARCH='armel';; \
+      *)     echo "Unsupported architecture: ${dpkgArch}"; exit 1;; \
+    esac && \
+    wget --no-verbose https://dl.influxdata.com/telegraf/releases/telegraf_${TELEGRAF_VERSION}-1_${ARCH}.deb.asc && \
+    wget --no-verbose https://dl.influxdata.com/telegraf/releases/telegraf_${TELEGRAF_VERSION}-1_${ARCH}.deb && \
+    gpg --batch --verify telegraf_${TELEGRAF_VERSION}-1_${ARCH}.deb.asc telegraf_${TELEGRAF_VERSION}-1_${ARCH}.deb && \
+    dpkg -i telegraf_${TELEGRAF_VERSION}-1_${ARCH}.deb && \
+    rm -f telegraf_${TELEGRAF_VERSION}-1_${ARCH}.deb*
+
+EXPOSE 8125/udp 8092/udp 8094
+
+COPY entrypoint.sh /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]
+CMD ["telegraf"]
 
 # Labels
 LABEL \
diff --git a/telegraf/build.yaml b/telegraf/build.yaml
index 53eb3cc..8efb67d 100644
--- a/telegraf/build.yaml
+++ b/telegraf/build.yaml
@@ -1,8 +1,8 @@
 build_from:
-  aarch64: library/alpine:3.15
-  amd64: library/alpine:3.15
-  armhf: library/alpine:3.15
-  armv7: library/alpine:3.15
-  i386: library/alpine:3.15
+  aarch64: library/buildpack-deps:bullseye-curl
+  amd64: library/buildpack-deps:bullseye-curl
+  armhf: library/buildpack-deps:bullseye-curl
+  armv7: library/buildpack-deps:bullseye-curl
+  i386: library/buildpack-deps:bullseye-curl
 args:
   TELEGRAF_VERSION: 1.23.0
\ No newline at end of file