From 0beffb2f2b0c344964bc1b142b0311bc793276bf Mon Sep 17 00:00:00 2001
From: J0WI <J0WI@users.noreply.github.com>
Date: Mon, 10 Feb 2020 19:45:10 +0100
Subject: [PATCH 1/2] Use busybox tar

---
 chronograf/1.6/alpine/Dockerfile    | 4 ++--
 chronograf/1.7/alpine/Dockerfile    | 4 ++--
 chronograf/1.8/alpine/Dockerfile    | 4 ++--
 influxdb/1.7/alpine/Dockerfile      | 4 ++--
 influxdb/1.7/data/alpine/Dockerfile | 4 ++--
 influxdb/1.7/meta/alpine/Dockerfile | 4 ++--
 influxdb/1.8/alpine/Dockerfile      | 4 ++--
 influxdb/1.8/data/alpine/Dockerfile | 4 ++--
 influxdb/1.8/meta/alpine/Dockerfile | 4 ++--
 influxdb/nightly/alpine/Dockerfile  | 4 ++--
 kapacitor/1.4/alpine/Dockerfile     | 4 ++--
 kapacitor/1.5/alpine/Dockerfile     | 4 ++--
 telegraf/1.13/alpine/Dockerfile     | 4 ++--
 telegraf/1.14/alpine/Dockerfile     | 4 ++--
 telegraf/1.15/alpine/Dockerfile     | 4 ++--
 15 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/chronograf/1.6/alpine/Dockerfile b/chronograf/1.6/alpine/Dockerfile
index 9f6e730a8..a0231303e 100644
--- a/chronograf/1.6/alpine/Dockerfile
+++ b/chronograf/1.6/alpine/Dockerfile
@@ -7,7 +7,7 @@ RUN apk add --no-cache ca-certificates && \
 ENV CHRONOGRAF_VERSION 1.6.2
 
 RUN set -ex && \
-    apk add --no-cache --virtual .build-deps wget gnupg tar && \
+    apk add --no-cache --virtual .build-deps wget gnupg && \
     for key in \
         05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
     do \
@@ -19,7 +19,7 @@ RUN set -ex && \
     wget --no-verbose https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
     gpg --batch --verify chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
     mkdir -p /usr/src && \
-    tar -C /usr/src -xzf chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
+    tar -C /usr/src -xf chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
     rm -f /usr/src/chronograf-*/chronograf.conf && \
     chmod +x /usr/src/chronograf-*/* && \
     cp -a /usr/src/chronograf-*/* /usr/bin/ && \
diff --git a/chronograf/1.7/alpine/Dockerfile b/chronograf/1.7/alpine/Dockerfile
index 11f5fad1a..37f7d3c1f 100644
--- a/chronograf/1.7/alpine/Dockerfile
+++ b/chronograf/1.7/alpine/Dockerfile
@@ -7,7 +7,7 @@ RUN apk add --no-cache ca-certificates && \
 ENV CHRONOGRAF_VERSION 1.7.17
 
 RUN set -ex && \
-    apk add --no-cache --virtual .build-deps wget gnupg tar && \
+    apk add --no-cache --virtual .build-deps wget gnupg && \
     for key in \
         05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
     do \
@@ -19,7 +19,7 @@ RUN set -ex && \
     wget --no-verbose https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
     gpg --batch --verify chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
     mkdir -p /usr/src && \
-    tar -C /usr/src -xzf chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
+    tar -C /usr/src -xf chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
     rm -f /usr/src/chronograf-*/chronograf.conf && \
     chmod +x /usr/src/chronograf-*/* && \
     cp -a /usr/src/chronograf-*/* /usr/bin/ && \
diff --git a/chronograf/1.8/alpine/Dockerfile b/chronograf/1.8/alpine/Dockerfile
index ab1e737f3..ff0dd2d94 100644
--- a/chronograf/1.8/alpine/Dockerfile
+++ b/chronograf/1.8/alpine/Dockerfile
@@ -7,7 +7,7 @@ RUN apk add --no-cache ca-certificates && \
 ENV CHRONOGRAF_VERSION 1.8.4
 
 RUN set -ex && \
-    apk add --no-cache --virtual .build-deps wget gnupg tar && \
+    apk add --no-cache --virtual .build-deps wget gnupg && \
     for key in \
         05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
     do \
@@ -19,7 +19,7 @@ RUN set -ex && \
     wget --no-verbose https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
     gpg --batch --verify chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
     mkdir -p /usr/src && \
-    tar -C /usr/src -xzf chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
+    tar -C /usr/src -xf chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
     rm -f /usr/src/chronograf-*/chronograf.conf && \
     chmod +x /usr/src/chronograf-*/* && \
     cp -a /usr/src/chronograf-*/* /usr/bin/ && \
diff --git a/influxdb/1.7/alpine/Dockerfile b/influxdb/1.7/alpine/Dockerfile
index b275f7d3f..cdfd7bc11 100644
--- a/influxdb/1.7/alpine/Dockerfile
+++ b/influxdb/1.7/alpine/Dockerfile
@@ -6,7 +6,7 @@ RUN apk add --no-cache tzdata bash ca-certificates && \
 
 ENV INFLUXDB_VERSION 1.7.10
 RUN set -ex && \
-    apk add --no-cache --virtual .build-deps wget gnupg tar && \
+    apk add --no-cache --virtual .build-deps wget gnupg && \
     for key in \
         05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
     do \
@@ -18,7 +18,7 @@ RUN set -ex && \
     wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
     gpg --batch --verify influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
     mkdir -p /usr/src && \
-    tar -C /usr/src -xzf influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
+    tar -C /usr/src -xf influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
     rm -f /usr/src/influxdb-*/influxdb.conf && \
     chmod +x /usr/src/influxdb-*/* && \
     cp -a /usr/src/influxdb-*/* /usr/bin/ && \
diff --git a/influxdb/1.7/data/alpine/Dockerfile b/influxdb/1.7/data/alpine/Dockerfile
index a888fc853..879d0c7af 100644
--- a/influxdb/1.7/data/alpine/Dockerfile
+++ b/influxdb/1.7/data/alpine/Dockerfile
@@ -6,7 +6,7 @@ RUN apk add --no-cache tzdata bash ca-certificates && \
 
 ENV INFLUXDB_VERSION 1.7.10-c1.7.10
 RUN set -ex && \
-    apk add --no-cache --virtual .build-deps wget gnupg tar && \
+    apk add --no-cache --virtual .build-deps wget gnupg && \
     for key in \
         05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
     do \
@@ -18,7 +18,7 @@ RUN set -ex && \
     wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
     gpg --batch --verify influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
     mkdir -p /usr/src && \
-    tar -C /usr/src -xzf influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
+    tar -C /usr/src -xf influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
     rm -f /usr/src/influxdb-*/influxdb.conf && \
     chmod +x /usr/src/influxdb-*/* && \
     cp -a /usr/src/influxdb-*/* /usr/bin/ && \
diff --git a/influxdb/1.7/meta/alpine/Dockerfile b/influxdb/1.7/meta/alpine/Dockerfile
index 6c64b3cf7..9eb886079 100644
--- a/influxdb/1.7/meta/alpine/Dockerfile
+++ b/influxdb/1.7/meta/alpine/Dockerfile
@@ -6,7 +6,7 @@ RUN apk add --no-cache tzdata bash ca-certificates && \
 
 ENV INFLUXDB_VERSION 1.7.10-c1.7.10
 RUN set -ex && \
-    apk add --no-cache --virtual .build-deps wget gnupg tar && \
+    apk add --no-cache --virtual .build-deps wget gnupg && \
     for key in \
         05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
     do \
@@ -18,7 +18,7 @@ RUN set -ex && \
     wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
     gpg --batch --verify influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
     mkdir -p /usr/src && \
-    tar -C /usr/src -xzf influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
+    tar -C /usr/src -xf influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
     rm -f /usr/src/influxdb-*/influxdb-meta.conf && \
     chmod +x /usr/src/influxdb-*/* && \
     cp -a /usr/src/influxdb-*/* /usr/bin/ && \
diff --git a/influxdb/1.8/alpine/Dockerfile b/influxdb/1.8/alpine/Dockerfile
index de849b6b5..01133fb76 100644
--- a/influxdb/1.8/alpine/Dockerfile
+++ b/influxdb/1.8/alpine/Dockerfile
@@ -6,7 +6,7 @@ RUN apk add --no-cache tzdata bash ca-certificates && \
 
 ENV INFLUXDB_VERSION 1.8.2
 RUN set -ex && \
-    apk add --no-cache --virtual .build-deps wget gnupg tar && \
+    apk add --no-cache --virtual .build-deps wget gnupg && \
     for key in \
         05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
     do \
@@ -18,7 +18,7 @@ RUN set -ex && \
     wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
     gpg --batch --verify influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
     mkdir -p /usr/src && \
-    tar -C /usr/src -xzf influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
+    tar -C /usr/src -xf influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
     rm -f /usr/src/influxdb-*/influxdb.conf && \
     chmod +x /usr/src/influxdb-*/* && \
     cp -a /usr/src/influxdb-*/* /usr/bin/ && \
diff --git a/influxdb/1.8/data/alpine/Dockerfile b/influxdb/1.8/data/alpine/Dockerfile
index da2b7dd18..553003f4f 100644
--- a/influxdb/1.8/data/alpine/Dockerfile
+++ b/influxdb/1.8/data/alpine/Dockerfile
@@ -6,7 +6,7 @@ RUN apk add --no-cache tzdata bash ca-certificates && \
 
 ENV INFLUXDB_VERSION 1.8.2-c1.8.2
 RUN set -ex && \
-    apk add --no-cache --virtual .build-deps wget gnupg tar && \
+    apk add --no-cache --virtual .build-deps wget gnupg && \
     for key in \
         05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
     do \
@@ -18,7 +18,7 @@ RUN set -ex && \
     wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
     gpg --batch --verify influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
     mkdir -p /usr/src && \
-    tar -C /usr/src -xzf influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
+    tar -C /usr/src -xf influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
     rm -f /usr/src/influxdb-*/influxdb.conf && \
     chmod +x /usr/src/influxdb-*/* && \
     cp -a /usr/src/influxdb-*/* /usr/bin/ && \
diff --git a/influxdb/1.8/meta/alpine/Dockerfile b/influxdb/1.8/meta/alpine/Dockerfile
index 8d0402560..7c75b7572 100644
--- a/influxdb/1.8/meta/alpine/Dockerfile
+++ b/influxdb/1.8/meta/alpine/Dockerfile
@@ -6,7 +6,7 @@ RUN apk add --no-cache tzdata bash ca-certificates && \
 
 ENV INFLUXDB_VERSION 1.8.2-c1.8.2
 RUN set -ex && \
-    apk add --no-cache --virtual .build-deps wget gnupg tar && \
+    apk add --no-cache --virtual .build-deps wget gnupg && \
     for key in \
         05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
     do \
@@ -18,7 +18,7 @@ RUN set -ex && \
     wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
     gpg --batch --verify influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
     mkdir -p /usr/src && \
-    tar -C /usr/src -xzf influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
+    tar -C /usr/src -xf influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
     rm -f /usr/src/influxdb-*/influxdb-meta.conf && \
     chmod +x /usr/src/influxdb-*/* && \
     cp -a /usr/src/influxdb-*/* /usr/bin/ && \
diff --git a/influxdb/nightly/alpine/Dockerfile b/influxdb/nightly/alpine/Dockerfile
index 24875412d..71c830043 100644
--- a/influxdb/nightly/alpine/Dockerfile
+++ b/influxdb/nightly/alpine/Dockerfile
@@ -3,7 +3,7 @@ FROM alpine:3.12
 RUN apk add --no-cache bash
 
 RUN set -ex && \
-    apk add --no-cache --virtual .build-deps wget gnupg tar ca-certificates && \
+    apk add --no-cache --virtual .build-deps wget gnupg ca-certificates && \
     update-ca-certificates && \
     for key in \
         05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
@@ -16,7 +16,7 @@ RUN set -ex && \
     wget --no-verbose https://dl.influxdata.com/influxdb/nightlies/influxdb-static-nightly_linux_amd64.tar.gz && \
     gpg --batch --verify influxdb-static-nightly_linux_amd64.tar.gz.asc influxdb-static-nightly_linux_amd64.tar.gz && \
     mkdir -p /usr/src && \
-    tar -C /usr/src -xzf influxdb-static-nightly_linux_amd64.tar.gz && \
+    tar -C /usr/src -xf influxdb-static-nightly_linux_amd64.tar.gz && \
     rm -f /usr/src/influxdb-*/influxdb.conf && \
     chmod +x /usr/src/influxdb-*/* && \
     cp -a /usr/src/influxdb-*/* /usr/bin/ && \
diff --git a/kapacitor/1.4/alpine/Dockerfile b/kapacitor/1.4/alpine/Dockerfile
index 4b4c7f603..e8ccd5d1b 100644
--- a/kapacitor/1.4/alpine/Dockerfile
+++ b/kapacitor/1.4/alpine/Dockerfile
@@ -7,7 +7,7 @@ RUN apk add --no-cache ca-certificates && \
 ENV KAPACITOR_VERSION 1.4.1
 
 RUN set -ex && \
-    apk add --no-cache --virtual .build-deps wget gnupg tar && \
+    apk add --no-cache --virtual .build-deps wget gnupg && \
     for key in \
         05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
     do \
@@ -19,7 +19,7 @@ RUN set -ex && \
     wget --no-verbose https://dl.influxdata.com/kapacitor/releases/kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz && \
     gpg --batch --verify kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz.asc kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz && \
     mkdir -p /usr/src && \
-    tar -C /usr/src -xzf kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz && \
+    tar -C /usr/src -xf kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz && \
     rm -f /usr/src/kapacitor-*/kapacitor.conf && \
     chmod +x /usr/src/kapacitor-*/* && \
     cp -a /usr/src/kapacitor-*/* /usr/bin/ && \
diff --git a/kapacitor/1.5/alpine/Dockerfile b/kapacitor/1.5/alpine/Dockerfile
index b01bb7fd1..2a4fcb11f 100644
--- a/kapacitor/1.5/alpine/Dockerfile
+++ b/kapacitor/1.5/alpine/Dockerfile
@@ -7,7 +7,7 @@ RUN apk add --no-cache ca-certificates && \
 ENV KAPACITOR_VERSION 1.5.6
 
 RUN set -ex && \
-    apk add --no-cache --virtual .build-deps wget gnupg tar && \
+    apk add --no-cache --virtual .build-deps wget gnupg && \
     for key in \
         05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
     do \
@@ -19,7 +19,7 @@ RUN set -ex && \
     wget --no-verbose https://dl.influxdata.com/kapacitor/releases/kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz && \
     gpg --batch --verify kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz.asc kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz && \
     mkdir -p /usr/src && \
-    tar -C /usr/src -xzf kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz && \
+    tar -C /usr/src -xf kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz && \
     rm -f /usr/src/kapacitor-*/kapacitor.conf && \
     chmod +x /usr/src/kapacitor-*/* && \
     cp -a /usr/src/kapacitor-*/* /usr/bin/ && \
diff --git a/telegraf/1.13/alpine/Dockerfile b/telegraf/1.13/alpine/Dockerfile
index 50982728e..6ccfa26ed 100644
--- a/telegraf/1.13/alpine/Dockerfile
+++ b/telegraf/1.13/alpine/Dockerfile
@@ -7,7 +7,7 @@ RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors
 ENV TELEGRAF_VERSION 1.13.4
 
 RUN set -ex && \
-    apk add --no-cache --virtual .build-deps wget gnupg tar && \
+    apk add --no-cache --virtual .build-deps wget gnupg && \
     for key in \
         05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
     do \
@@ -19,7 +19,7 @@ RUN set -ex && \
     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 && \
+    tar -C /usr/src -xf 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/ && \
diff --git a/telegraf/1.14/alpine/Dockerfile b/telegraf/1.14/alpine/Dockerfile
index db24217d6..86a337dda 100644
--- a/telegraf/1.14/alpine/Dockerfile
+++ b/telegraf/1.14/alpine/Dockerfile
@@ -7,7 +7,7 @@ RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors
 ENV TELEGRAF_VERSION 1.14.5
 
 RUN set -ex && \
-    apk add --no-cache --virtual .build-deps wget gnupg tar && \
+    apk add --no-cache --virtual .build-deps wget gnupg && \
     for key in \
         05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
     do \
@@ -19,7 +19,7 @@ RUN set -ex && \
     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 && \
+    tar -C /usr/src -xf 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/ && \
diff --git a/telegraf/1.15/alpine/Dockerfile b/telegraf/1.15/alpine/Dockerfile
index 776b45ea1..6ba420658 100644
--- a/telegraf/1.15/alpine/Dockerfile
+++ b/telegraf/1.15/alpine/Dockerfile
@@ -7,7 +7,7 @@ RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors
 ENV TELEGRAF_VERSION 1.15.2
 
 RUN set -ex && \
-    apk add --no-cache --virtual .build-deps wget gnupg tar && \
+    apk add --no-cache --virtual .build-deps wget gnupg && \
     for key in \
         05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
     do \
@@ -19,7 +19,7 @@ RUN set -ex && \
     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 && \
+    tar -C /usr/src -xf 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/ && \

From 034c4af89a6c0cd63e846effeb02a99606ba23e8 Mon Sep 17 00:00:00 2001
From: J0WI <J0WI@users.noreply.github.com>
Date: Mon, 10 Feb 2020 19:53:08 +0100
Subject: [PATCH 2/2] Use busybox wget

---
 chronograf/1.6/alpine/Dockerfile    | 6 +++---
 chronograf/1.7/alpine/Dockerfile    | 6 +++---
 chronograf/1.8/alpine/Dockerfile    | 6 +++---
 influxdb/1.7/alpine/Dockerfile      | 6 +++---
 influxdb/1.7/data/alpine/Dockerfile | 6 +++---
 influxdb/1.7/meta/alpine/Dockerfile | 6 +++---
 influxdb/1.8/alpine/Dockerfile      | 6 +++---
 influxdb/1.8/data/alpine/Dockerfile | 6 +++---
 influxdb/1.8/meta/alpine/Dockerfile | 6 +++---
 influxdb/nightly/alpine/Dockerfile  | 6 +++---
 kapacitor/1.4/alpine/Dockerfile     | 6 +++---
 kapacitor/1.5/alpine/Dockerfile     | 6 +++---
 telegraf/1.13/alpine/Dockerfile     | 6 +++---
 telegraf/1.14/alpine/Dockerfile     | 6 +++---
 telegraf/1.15/alpine/Dockerfile     | 6 +++---
 15 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/chronograf/1.6/alpine/Dockerfile b/chronograf/1.6/alpine/Dockerfile
index a0231303e..8b3debd7b 100644
--- a/chronograf/1.6/alpine/Dockerfile
+++ b/chronograf/1.6/alpine/Dockerfile
@@ -7,7 +7,7 @@ RUN apk add --no-cache ca-certificates && \
 ENV CHRONOGRAF_VERSION 1.6.2
 
 RUN set -ex && \
-    apk add --no-cache --virtual .build-deps wget gnupg && \
+    apk add --no-cache --virtual .build-deps gnupg && \
     for key in \
         05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
     do \
@@ -15,8 +15,8 @@ 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/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc && \
-    wget --no-verbose https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
+    wget -q https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc && \
+    wget -q https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
     gpg --batch --verify chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
     mkdir -p /usr/src && \
     tar -C /usr/src -xf chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
diff --git a/chronograf/1.7/alpine/Dockerfile b/chronograf/1.7/alpine/Dockerfile
index 37f7d3c1f..cbcd65608 100644
--- a/chronograf/1.7/alpine/Dockerfile
+++ b/chronograf/1.7/alpine/Dockerfile
@@ -7,7 +7,7 @@ RUN apk add --no-cache ca-certificates && \
 ENV CHRONOGRAF_VERSION 1.7.17
 
 RUN set -ex && \
-    apk add --no-cache --virtual .build-deps wget gnupg && \
+    apk add --no-cache --virtual .build-deps gnupg && \
     for key in \
         05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
     do \
@@ -15,8 +15,8 @@ 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/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc && \
-    wget --no-verbose https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
+    wget -q https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc && \
+    wget -q https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
     gpg --batch --verify chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
     mkdir -p /usr/src && \
     tar -C /usr/src -xf chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
diff --git a/chronograf/1.8/alpine/Dockerfile b/chronograf/1.8/alpine/Dockerfile
index ff0dd2d94..952510d7a 100644
--- a/chronograf/1.8/alpine/Dockerfile
+++ b/chronograf/1.8/alpine/Dockerfile
@@ -7,7 +7,7 @@ RUN apk add --no-cache ca-certificates && \
 ENV CHRONOGRAF_VERSION 1.8.4
 
 RUN set -ex && \
-    apk add --no-cache --virtual .build-deps wget gnupg && \
+    apk add --no-cache --virtual .build-deps gnupg && \
     for key in \
         05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
     do \
@@ -15,8 +15,8 @@ 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/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc && \
-    wget --no-verbose https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
+    wget -q https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc && \
+    wget -q https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
     gpg --batch --verify chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
     mkdir -p /usr/src && \
     tar -C /usr/src -xf chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
diff --git a/influxdb/1.7/alpine/Dockerfile b/influxdb/1.7/alpine/Dockerfile
index cdfd7bc11..df9ccf1f0 100644
--- a/influxdb/1.7/alpine/Dockerfile
+++ b/influxdb/1.7/alpine/Dockerfile
@@ -6,7 +6,7 @@ RUN apk add --no-cache tzdata bash ca-certificates && \
 
 ENV INFLUXDB_VERSION 1.7.10
 RUN set -ex && \
-    apk add --no-cache --virtual .build-deps wget gnupg && \
+    apk add --no-cache --virtual .build-deps gnupg && \
     for key in \
         05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
     do \
@@ -14,8 +14,8 @@ 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/influxdb/releases/influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc && \
-    wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
+    wget -q https://dl.influxdata.com/influxdb/releases/influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc && \
+    wget -q https://dl.influxdata.com/influxdb/releases/influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
     gpg --batch --verify influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
     mkdir -p /usr/src && \
     tar -C /usr/src -xf influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
diff --git a/influxdb/1.7/data/alpine/Dockerfile b/influxdb/1.7/data/alpine/Dockerfile
index 879d0c7af..8be8658c1 100644
--- a/influxdb/1.7/data/alpine/Dockerfile
+++ b/influxdb/1.7/data/alpine/Dockerfile
@@ -6,7 +6,7 @@ RUN apk add --no-cache tzdata bash ca-certificates && \
 
 ENV INFLUXDB_VERSION 1.7.10-c1.7.10
 RUN set -ex && \
-    apk add --no-cache --virtual .build-deps wget gnupg && \
+    apk add --no-cache --virtual .build-deps gnupg && \
     for key in \
         05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
     do \
@@ -14,8 +14,8 @@ 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/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc && \
-    wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
+    wget -q https://dl.influxdata.com/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc && \
+    wget -q https://dl.influxdata.com/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
     gpg --batch --verify influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
     mkdir -p /usr/src && \
     tar -C /usr/src -xf influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
diff --git a/influxdb/1.7/meta/alpine/Dockerfile b/influxdb/1.7/meta/alpine/Dockerfile
index 9eb886079..2c6a5c2ef 100644
--- a/influxdb/1.7/meta/alpine/Dockerfile
+++ b/influxdb/1.7/meta/alpine/Dockerfile
@@ -6,7 +6,7 @@ RUN apk add --no-cache tzdata bash ca-certificates && \
 
 ENV INFLUXDB_VERSION 1.7.10-c1.7.10
 RUN set -ex && \
-    apk add --no-cache --virtual .build-deps wget gnupg && \
+    apk add --no-cache --virtual .build-deps gnupg && \
     for key in \
         05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
     do \
@@ -14,8 +14,8 @@ 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/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc && \
-    wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
+    wget -q https://dl.influxdata.com/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc && \
+    wget -q https://dl.influxdata.com/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
     gpg --batch --verify influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
     mkdir -p /usr/src && \
     tar -C /usr/src -xf influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
diff --git a/influxdb/1.8/alpine/Dockerfile b/influxdb/1.8/alpine/Dockerfile
index 01133fb76..0424a5969 100644
--- a/influxdb/1.8/alpine/Dockerfile
+++ b/influxdb/1.8/alpine/Dockerfile
@@ -6,7 +6,7 @@ RUN apk add --no-cache tzdata bash ca-certificates && \
 
 ENV INFLUXDB_VERSION 1.8.2
 RUN set -ex && \
-    apk add --no-cache --virtual .build-deps wget gnupg && \
+    apk add --no-cache --virtual .build-deps gnupg && \
     for key in \
         05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
     do \
@@ -14,8 +14,8 @@ 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/influxdb/releases/influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc && \
-    wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
+    wget -q https://dl.influxdata.com/influxdb/releases/influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc && \
+    wget -q https://dl.influxdata.com/influxdb/releases/influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
     gpg --batch --verify influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
     mkdir -p /usr/src && \
     tar -C /usr/src -xf influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
diff --git a/influxdb/1.8/data/alpine/Dockerfile b/influxdb/1.8/data/alpine/Dockerfile
index 553003f4f..6684c50db 100644
--- a/influxdb/1.8/data/alpine/Dockerfile
+++ b/influxdb/1.8/data/alpine/Dockerfile
@@ -6,7 +6,7 @@ RUN apk add --no-cache tzdata bash ca-certificates && \
 
 ENV INFLUXDB_VERSION 1.8.2-c1.8.2
 RUN set -ex && \
-    apk add --no-cache --virtual .build-deps wget gnupg && \
+    apk add --no-cache --virtual .build-deps gnupg && \
     for key in \
         05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
     do \
@@ -14,8 +14,8 @@ 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/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc && \
-    wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
+    wget -q https://dl.influxdata.com/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc && \
+    wget -q https://dl.influxdata.com/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
     gpg --batch --verify influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
     mkdir -p /usr/src && \
     tar -C /usr/src -xf influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
diff --git a/influxdb/1.8/meta/alpine/Dockerfile b/influxdb/1.8/meta/alpine/Dockerfile
index 7c75b7572..10feec78b 100644
--- a/influxdb/1.8/meta/alpine/Dockerfile
+++ b/influxdb/1.8/meta/alpine/Dockerfile
@@ -6,7 +6,7 @@ RUN apk add --no-cache tzdata bash ca-certificates && \
 
 ENV INFLUXDB_VERSION 1.8.2-c1.8.2
 RUN set -ex && \
-    apk add --no-cache --virtual .build-deps wget gnupg && \
+    apk add --no-cache --virtual .build-deps gnupg && \
     for key in \
         05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
     do \
@@ -14,8 +14,8 @@ 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/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc && \
-    wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
+    wget -q https://dl.influxdata.com/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc && \
+    wget -q https://dl.influxdata.com/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
     gpg --batch --verify influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
     mkdir -p /usr/src && \
     tar -C /usr/src -xf influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
diff --git a/influxdb/nightly/alpine/Dockerfile b/influxdb/nightly/alpine/Dockerfile
index 71c830043..93ac7a227 100644
--- a/influxdb/nightly/alpine/Dockerfile
+++ b/influxdb/nightly/alpine/Dockerfile
@@ -3,7 +3,7 @@ FROM alpine:3.12
 RUN apk add --no-cache bash
 
 RUN set -ex && \
-    apk add --no-cache --virtual .build-deps wget gnupg ca-certificates && \
+    apk add --no-cache --virtual .build-deps gnupg ca-certificates && \
     update-ca-certificates && \
     for key in \
         05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
@@ -12,8 +12,8 @@ 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/influxdb/nightlies/influxdb-static-nightly_linux_amd64.tar.gz.asc && \
-    wget --no-verbose https://dl.influxdata.com/influxdb/nightlies/influxdb-static-nightly_linux_amd64.tar.gz && \
+    wget -q https://dl.influxdata.com/influxdb/nightlies/influxdb-static-nightly_linux_amd64.tar.gz.asc && \
+    wget -q https://dl.influxdata.com/influxdb/nightlies/influxdb-static-nightly_linux_amd64.tar.gz && \
     gpg --batch --verify influxdb-static-nightly_linux_amd64.tar.gz.asc influxdb-static-nightly_linux_amd64.tar.gz && \
     mkdir -p /usr/src && \
     tar -C /usr/src -xf influxdb-static-nightly_linux_amd64.tar.gz && \
diff --git a/kapacitor/1.4/alpine/Dockerfile b/kapacitor/1.4/alpine/Dockerfile
index e8ccd5d1b..0f3002206 100644
--- a/kapacitor/1.4/alpine/Dockerfile
+++ b/kapacitor/1.4/alpine/Dockerfile
@@ -7,7 +7,7 @@ RUN apk add --no-cache ca-certificates && \
 ENV KAPACITOR_VERSION 1.4.1
 
 RUN set -ex && \
-    apk add --no-cache --virtual .build-deps wget gnupg && \
+    apk add --no-cache --virtual .build-deps gnupg && \
     for key in \
         05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
     do \
@@ -15,8 +15,8 @@ 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/kapacitor/releases/kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz.asc && \
-    wget --no-verbose https://dl.influxdata.com/kapacitor/releases/kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz && \
+    wget -q https://dl.influxdata.com/kapacitor/releases/kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz.asc && \
+    wget -q https://dl.influxdata.com/kapacitor/releases/kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz && \
     gpg --batch --verify kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz.asc kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz && \
     mkdir -p /usr/src && \
     tar -C /usr/src -xf kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz && \
diff --git a/kapacitor/1.5/alpine/Dockerfile b/kapacitor/1.5/alpine/Dockerfile
index 2a4fcb11f..c690f93e9 100644
--- a/kapacitor/1.5/alpine/Dockerfile
+++ b/kapacitor/1.5/alpine/Dockerfile
@@ -7,7 +7,7 @@ RUN apk add --no-cache ca-certificates && \
 ENV KAPACITOR_VERSION 1.5.6
 
 RUN set -ex && \
-    apk add --no-cache --virtual .build-deps wget gnupg && \
+    apk add --no-cache --virtual .build-deps gnupg && \
     for key in \
         05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
     do \
@@ -15,8 +15,8 @@ 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/kapacitor/releases/kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz.asc && \
-    wget --no-verbose https://dl.influxdata.com/kapacitor/releases/kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz && \
+    wget -q https://dl.influxdata.com/kapacitor/releases/kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz.asc && \
+    wget -q https://dl.influxdata.com/kapacitor/releases/kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz && \
     gpg --batch --verify kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz.asc kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz && \
     mkdir -p /usr/src && \
     tar -C /usr/src -xf kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz && \
diff --git a/telegraf/1.13/alpine/Dockerfile b/telegraf/1.13/alpine/Dockerfile
index 6ccfa26ed..6988e6ad9 100644
--- a/telegraf/1.13/alpine/Dockerfile
+++ b/telegraf/1.13/alpine/Dockerfile
@@ -7,7 +7,7 @@ RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors
 ENV TELEGRAF_VERSION 1.13.4
 
 RUN set -ex && \
-    apk add --no-cache --virtual .build-deps wget gnupg && \
+    apk add --no-cache --virtual .build-deps gnupg && \
     for key in \
         05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
     do \
@@ -15,8 +15,8 @@ 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 && \
+    wget -q https://dl.influxdata.com/telegraf/releases/telegraf-${TELEGRAF_VERSION}-static_linux_amd64.tar.gz.asc && \
+    wget -q 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 -xf telegraf-${TELEGRAF_VERSION}-static_linux_amd64.tar.gz && \
diff --git a/telegraf/1.14/alpine/Dockerfile b/telegraf/1.14/alpine/Dockerfile
index 86a337dda..5d4977744 100644
--- a/telegraf/1.14/alpine/Dockerfile
+++ b/telegraf/1.14/alpine/Dockerfile
@@ -7,7 +7,7 @@ RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors
 ENV TELEGRAF_VERSION 1.14.5
 
 RUN set -ex && \
-    apk add --no-cache --virtual .build-deps wget gnupg && \
+    apk add --no-cache --virtual .build-deps gnupg && \
     for key in \
         05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
     do \
@@ -15,8 +15,8 @@ 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 && \
+    wget -q https://dl.influxdata.com/telegraf/releases/telegraf-${TELEGRAF_VERSION}-static_linux_amd64.tar.gz.asc && \
+    wget -q 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 -xf telegraf-${TELEGRAF_VERSION}-static_linux_amd64.tar.gz && \
diff --git a/telegraf/1.15/alpine/Dockerfile b/telegraf/1.15/alpine/Dockerfile
index 6ba420658..74014d1ca 100644
--- a/telegraf/1.15/alpine/Dockerfile
+++ b/telegraf/1.15/alpine/Dockerfile
@@ -7,7 +7,7 @@ RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors
 ENV TELEGRAF_VERSION 1.15.2
 
 RUN set -ex && \
-    apk add --no-cache --virtual .build-deps wget gnupg && \
+    apk add --no-cache --virtual .build-deps gnupg && \
     for key in \
         05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
     do \
@@ -15,8 +15,8 @@ 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 && \
+    wget -q https://dl.influxdata.com/telegraf/releases/telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz.asc && \
+    wget -q 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 -xf telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz && \