From 174bdc5f4ebb2986252692a6c9e1a48234d1b4aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Bonelle?= Date: Wed, 1 Feb 2023 22:21:43 +0100 Subject: [PATCH] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'telegraf/Dockerfil?= =?UTF-8?q?e'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- telegraf/Dockerfile | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/telegraf/Dockerfile b/telegraf/Dockerfile index d2de355..00fc313 100755 --- a/telegraf/Dockerfile +++ b/telegraf/Dockerfile @@ -31,29 +31,15 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ c_rehash && \ rm -rf /var/lib/apt/lists/* +ENV TELEGRAF_VERSION ${TELEGRAF_VERSION} 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* + wget -q https://repos.influxdata.com/influxdata-archive_compat.key && \ + echo '393e8779c89ac8d958f81f942f9ad7fb82a25e133faddaf92e15b16e6ac9ce4c influxdata-archive_compat.key' | sha256sum -c && cat influxdata-archive_compat.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg > /dev/null && \ + echo 'deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg] https://repos.influxdata.com/debian stable main' | sudo tee /etc/apt/sources.list.d/influxdata.list && \ + sudo apt-get install telegraf=1.25.1 && \ + rm -rf /var/lib/apt/lists/* RUN curl -J -L -o /tmp/bashio.tar.gz \ "https://github.com/hassio-addons/bashio/archive/${BASHIO_VERSION}.tar.gz" && \