From 636da53f332fd930ea15b2d4d54614571cbeff2d Mon Sep 17 00:00:00 2001
From: Steven Soroka <ssoroka@influxdata.com>
Date: Thu, 24 Dec 2020 15:59:01 -0500
Subject: [PATCH] add missing files for 1.17

---
 telegraf/{1.14 => 1.17}/Dockerfile           |  6 ++++--
 telegraf/{1.14 => 1.17}/alpine/Dockerfile    | 16 ++++++++--------
 telegraf/{1.14 => 1.17}/alpine/entrypoint.sh |  0
 telegraf/{1.14 => 1.17}/entrypoint.sh        |  0
 4 files changed, 12 insertions(+), 10 deletions(-)
 rename telegraf/{1.14 => 1.17}/Dockerfile (91%)
 rename telegraf/{1.14 => 1.17}/alpine/Dockerfile (67%)
 rename telegraf/{1.14 => 1.17}/alpine/entrypoint.sh (100%)
 rename telegraf/{1.14 => 1.17}/entrypoint.sh (100%)

diff --git a/telegraf/1.14/Dockerfile b/telegraf/1.17/Dockerfile
similarity index 91%
rename from telegraf/1.14/Dockerfile
rename to telegraf/1.17/Dockerfile
index d0ba2b4b3..f1512c99c 100644
--- a/telegraf/1.14/Dockerfile
+++ b/telegraf/1.17/Dockerfile
@@ -1,10 +1,12 @@
-FROM buildpack-deps:stretch-curl
+FROM buildpack-deps:buster-curl
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends iputils-ping snmp procps lm-sensors && \
     rm -rf /var/lib/apt/lists/*
 
 RUN set -ex && \
+    mkdir ~/.gnupg; \
+    echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
     for key in \
         05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
     do \
@@ -13,7 +15,7 @@ RUN set -ex && \
         gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
     done
 
-ENV TELEGRAF_VERSION 1.14.5
+ENV TELEGRAF_VERSION 1.17.0
 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
     case "${dpkgArch##*-}" in \
       amd64) ARCH='amd64';; \
diff --git a/telegraf/1.14/alpine/Dockerfile b/telegraf/1.17/alpine/Dockerfile
similarity index 67%
rename from telegraf/1.14/alpine/Dockerfile
rename to telegraf/1.17/alpine/Dockerfile
index f4b9a3dbd..0379242ab 100644
--- a/telegraf/1.14/alpine/Dockerfile
+++ b/telegraf/1.17/alpine/Dockerfile
@@ -4,7 +4,7 @@ RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
 RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors tzdata && \
     update-ca-certificates
 
-ENV TELEGRAF_VERSION 1.14.5
+ENV TELEGRAF_VERSION 1.17.0
 
 RUN set -ex && \
     mkdir ~/.gnupg; \
@@ -17,14 +17,14 @@ RUN set -ex && \
         gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
         gpg --keyserver keyserver.pgp.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 && \
+    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*/telegraf.conf /etc/telegraf/ && \
-    chmod +x /usr/src/telegraf*/* && \
-    cp -a /usr/src/telegraf*/* /usr/bin/ && \
+    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
diff --git a/telegraf/1.14/alpine/entrypoint.sh b/telegraf/1.17/alpine/entrypoint.sh
similarity index 100%
rename from telegraf/1.14/alpine/entrypoint.sh
rename to telegraf/1.17/alpine/entrypoint.sh
diff --git a/telegraf/1.14/entrypoint.sh b/telegraf/1.17/entrypoint.sh
similarity index 100%
rename from telegraf/1.14/entrypoint.sh
rename to telegraf/1.17/entrypoint.sh