diff --git a/chronograf/1.10/Dockerfile b/chronograf/1.10/Dockerfile
index 286703ca4f115f85eb0977c7d794701700ccf107..cb5fe545cc2eb8838d070ed70acd8ace7e12c9d9 100644
--- a/chronograf/1.10/Dockerfile
+++ b/chronograf/1.10/Dockerfile
@@ -1,15 +1,17 @@
FROM debian:bullseye-slim
-RUN set -ex && \
- mkdir ~/.gnupg; \
- echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
- apt-get update && apt-get install -y gnupg ca-certificates dirmngr --no-install-recommends && \
- rm -rf /var/lib/apt/lists/* && \
- for key in \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
- do \
- gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
- done
+RUN apt-get update && \
+ apt-get install \
+ --yes \
+ --no-install-recommends \
+ ca-certificates \
+ curl \
+ gnupg && \
+ rm -rf /var/lib/apt/lists
+
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV CHRONOGRAF_VERSION 1.10.0
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
@@ -21,14 +23,11 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
*) echo "Unsupported architecture: ${dpkgArch}"; exit 1;; \
esac && \
set -x && \
- apt-get update && apt-get install -y ca-certificates curl --no-install-recommends && \
- rm -rf /var/lib/apt/lists/* && \
curl -SLO "https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb.asc" && \
curl -SLO "https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb" && \
gpg --batch --verify chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb.asc chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb && \
dpkg -i chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb && \
- rm -f chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb* && \
- apt-get purge -y --auto-remove $buildDeps
+ rm -f chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb*
COPY LICENSE /usr/share/chronograf/LICENSE
COPY agpl-3.0.md /usr/share/chronograf/agpl-3.0.md
diff --git a/chronograf/1.10/alpine/Dockerfile b/chronograf/1.10/alpine/Dockerfile
index 9e45826616ac70ce5452d103493d7a3490a3588b..ca35bd2c6b72cf51c9a507f7666ef895335e9528 100644
--- a/chronograf/1.10/alpine/Dockerfile
+++ b/chronograf/1.10/alpine/Dockerfile
@@ -1,20 +1,17 @@
FROM alpine:3.14
RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
-RUN apk add --no-cache ca-certificates && \
+RUN apk add --no-cache ca-certificates gnupg && \
update-ca-certificates
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
+
ENV CHRONOGRAF_VERSION 1.10.0
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 && \
+ apk add --no-cache --virtual .build-deps wget tar && \
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 && \
gpg --batch --verify chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
@@ -23,8 +20,7 @@ RUN set -ex && \
rm -f /usr/src/chronograf-*/chronograf.conf && \
chmod +x /usr/src/chronograf-*/* && \
cp -a /usr/src/chronograf-*/* /usr/bin/ && \
- gpgconf --kill all && \
- rm -rf *.tar.gz* /usr/src /root/.gnupg && \
+ rm -rf *.tar.gz* /usr/src && \
apk del .build-deps
COPY LICENSE /usr/share/chronograf/LICENSE
diff --git a/chronograf/1.6/Dockerfile b/chronograf/1.6/Dockerfile
index f2f952b7385216c13ec3b46fe3289863d1ff69ac..8b1980894a7bb6c53286a3948a407f2732aacabd 100644
--- a/chronograf/1.6/Dockerfile
+++ b/chronograf/1.6/Dockerfile
@@ -1,20 +1,17 @@
FROM debian:bullseye-slim
-RUN apt-get update && \
- apt-get install --no-install-recommends -y \
- ca-certificates \
- curl \
- dirmngr \
- gnupg && \
- rm -rf /var/lib/apt/lists/*
+RUN apt-get update && \
+ apt-get install \
+ --yes \
+ --no-install-recommends \
+ ca-certificates \
+ curl \
+ gnupg && \
+ rm -rf /var/lib/apt/lists
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV CHRONOGRAF_VERSION 1.6.2
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
diff --git a/chronograf/1.6/alpine/Dockerfile b/chronograf/1.6/alpine/Dockerfile
index 582f5eca31afb3acfca1f06fb8e6cc0f2d455206..d2cb7ff55fa812231f476d551216c44d5b4a8488 100644
--- a/chronograf/1.6/alpine/Dockerfile
+++ b/chronograf/1.6/alpine/Dockerfile
@@ -4,13 +4,9 @@ RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
RUN apk add --no-cache ca-certificates gnupg && \
update-ca-certificates
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV CHRONOGRAF_VERSION 1.6.2
diff --git a/chronograf/1.7/Dockerfile b/chronograf/1.7/Dockerfile
index b15a259cf1c587ec8a82ec378ac90682fa0af677..e4207c0251d3604f70f3b42bb2cacf5431678754 100644
--- a/chronograf/1.7/Dockerfile
+++ b/chronograf/1.7/Dockerfile
@@ -1,20 +1,17 @@
FROM debian:bullseye-slim
-RUN apt-get update && \
- apt-get install --no-install-recommends -y \
- ca-certificates \
- curl \
- dirmngr \
- gnupg && \
- rm -rf /var/lib/apt/lists/*
+RUN apt-get update && \
+ apt-get install \
+ --yes \
+ --no-install-recommends \
+ ca-certificates \
+ curl \
+ gnupg && \
+ rm -rf /var/lib/apt/lists
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV CHRONOGRAF_VERSION 1.7.17
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
diff --git a/chronograf/1.7/alpine/Dockerfile b/chronograf/1.7/alpine/Dockerfile
index 252107ec137fcef301463e86c2c8ffbf8746aaeb..643e32a2ad44a375455f327e7106d5f07ff3ddfe 100644
--- a/chronograf/1.7/alpine/Dockerfile
+++ b/chronograf/1.7/alpine/Dockerfile
@@ -4,13 +4,9 @@ RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
RUN apk add --no-cache ca-certificates gnupg && \
update-ca-certificates
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV CHRONOGRAF_VERSION 1.7.17
RUN set -ex && \
diff --git a/chronograf/1.8/Dockerfile b/chronograf/1.8/Dockerfile
index 3040e576427b0b444d6854a9846a0c38c1e7a1ef..dc3b14fb66ee54a10954844b751ce42e93c7d01e 100644
--- a/chronograf/1.8/Dockerfile
+++ b/chronograf/1.8/Dockerfile
@@ -1,20 +1,17 @@
FROM debian:bullseye-slim
-RUN apt-get update && \
- apt-get install --no-install-recommends -y \
- ca-certificates \
- curl \
- dirmngr \
- gnupg && \
- rm -rf /var/lib/apt/lists/*
+RUN apt-get update && \
+ apt-get install \
+ --yes \
+ --no-install-recommends \
+ ca-certificates \
+ curl \
+ gnupg && \
+ rm -rf /var/lib/apt/lists
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV CHRONOGRAF_VERSION 1.8.10
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
diff --git a/chronograf/1.8/alpine/Dockerfile b/chronograf/1.8/alpine/Dockerfile
index 1da5d2f801252bb362800a780178fa0c3d973959..572342302e24f1cb41f9e40fae9e9fcce596b1d6 100644
--- a/chronograf/1.8/alpine/Dockerfile
+++ b/chronograf/1.8/alpine/Dockerfile
@@ -4,13 +4,9 @@ RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
RUN apk add --no-cache ca-certificates gnupg && \
update-ca-certificates
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV CHRONOGRAF_VERSION 1.8.10
diff --git a/chronograf/1.9/Dockerfile b/chronograf/1.9/Dockerfile
index ca5162b5f438e96fd96a6ee064bca25f081b0a4d..2d8252eea930977e0402e3c41cdfeda883389886 100644
--- a/chronograf/1.9/Dockerfile
+++ b/chronograf/1.9/Dockerfile
@@ -1,20 +1,17 @@
FROM debian:bullseye-slim
-RUN apt-get update && \
- apt-get install --no-install-recommends -y \
- ca-certificates \
- curl \
- dirmngr \
- gnupg && \
- rm -rf /var/lib/apt/lists/*
+RUN apt-get update && \
+ apt-get install \
+ --yes \
+ --no-install-recommends \
+ ca-certificates \
+ curl \
+ gnupg && \
+ rm -rf /var/lib/apt/lists
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV CHRONOGRAF_VERSION 1.9.4
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
diff --git a/chronograf/1.9/alpine/Dockerfile b/chronograf/1.9/alpine/Dockerfile
index e587d5ef30f2420a9b86c30aab2a67f7d9a23792..eda2f027136479d27ad8b74fcb29e854e9fa74da 100644
--- a/chronograf/1.9/alpine/Dockerfile
+++ b/chronograf/1.9/alpine/Dockerfile
@@ -4,13 +4,9 @@ RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
RUN apk add --no-cache ca-certificates gnupg && \
update-ca-certificates
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV CHRONOGRAF_VERSION 1.9.4
diff --git a/influxdb/1.10/data/Dockerfile b/influxdb/1.10/data/Dockerfile
index 35a787cc1b928437da09cfdf52d3d15e33bb1e94..1d5436424c584ebb867842525556d72513a81466 100644
--- a/influxdb/1.10/data/Dockerfile
+++ b/influxdb/1.10/data/Dockerfile
@@ -1,12 +1,8 @@
FROM buildpack-deps:bullseye-curl
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV INFLUXDB_VERSION 1.10.0-c1.10.0
RUN wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data_${INFLUXDB_VERSION}_amd64.deb.asc && \
diff --git a/influxdb/1.10/data/alpine/Dockerfile b/influxdb/1.10/data/alpine/Dockerfile
index bcebe9d71966061109dace78db6e7974d02d6aa8..476c4bde318e805adb0f14eafc6178f76363da65 100644
--- a/influxdb/1.10/data/alpine/Dockerfile
+++ b/influxdb/1.10/data/alpine/Dockerfile
@@ -4,13 +4,9 @@ RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
RUN apk add --no-cache tzdata bash ca-certificates gnupg && \
update-ca-certificates
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV INFLUXDB_VERSION 1.10.0-c1.10.0
RUN set -ex && \
diff --git a/influxdb/1.10/meta/Dockerfile b/influxdb/1.10/meta/Dockerfile
index 431121ec4123935d1d26c3ab7554ea7f5964a812..568dd87955d7db6ef0ec43fe57b3e8a0d0dbd770 100644
--- a/influxdb/1.10/meta/Dockerfile
+++ b/influxdb/1.10/meta/Dockerfile
@@ -1,12 +1,8 @@
FROM buildpack-deps:bullseye-curl
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV INFLUXDB_VERSION 1.10.0-c1.10.0
RUN wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta_${INFLUXDB_VERSION}_amd64.deb.asc && \
diff --git a/influxdb/1.10/meta/alpine/Dockerfile b/influxdb/1.10/meta/alpine/Dockerfile
index 21e322c6a17f72c16be38ba4a97b6a36c54f58eb..b900c75c75fec10420cb90bac79d816b03b4ac9d 100644
--- a/influxdb/1.10/meta/alpine/Dockerfile
+++ b/influxdb/1.10/meta/alpine/Dockerfile
@@ -4,13 +4,9 @@ RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
RUN apk add --no-cache tzdata bash ca-certificates gnupg && \
update-ca-certificates
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV INFLUXDB_VERSION 1.10.0-c1.10.0
RUN set -ex && \
diff --git a/influxdb/1.7/Dockerfile b/influxdb/1.7/Dockerfile
index cada26909a2bb48150c4f745844c2e049353dd83..9417401d4e233e0d48d0a85bbcd1c6e2362f635e 100644
--- a/influxdb/1.7/Dockerfile
+++ b/influxdb/1.7/Dockerfile
@@ -1,12 +1,8 @@
FROM buildpack-deps:bullseye-curl
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV INFLUXDB_VERSION 1.7.11
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
diff --git a/influxdb/1.7/alpine/Dockerfile b/influxdb/1.7/alpine/Dockerfile
index f5a527f453acfcbd352a221336ebb5de55fe7cb3..cebff6bf33dbe3bd82a7c39e110185b4f4bbb292 100644
--- a/influxdb/1.7/alpine/Dockerfile
+++ b/influxdb/1.7/alpine/Dockerfile
@@ -4,13 +4,9 @@ RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
RUN apk add --no-cache tzdata bash ca-certificates gnupg && \
update-ca-certificates
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV INFLUXDB_VERSION 1.7.11
RUN set -ex && \
diff --git a/influxdb/1.7/data/Dockerfile b/influxdb/1.7/data/Dockerfile
index ee7775f9ee8e91bfd81aa2c8cfd17095eab2168a..eb072a3bade1de0c99b9e2ae0623401795a81f6d 100644
--- a/influxdb/1.7/data/Dockerfile
+++ b/influxdb/1.7/data/Dockerfile
@@ -1,12 +1,8 @@
FROM buildpack-deps:bullseye-curl
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV INFLUXDB_VERSION 1.7.11-c1.7.11
RUN wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data_${INFLUXDB_VERSION}_amd64.deb.asc && \
diff --git a/influxdb/1.7/data/alpine/Dockerfile b/influxdb/1.7/data/alpine/Dockerfile
index fed3f528fcb59d3b5ba49ff9ef5b472500bc0285..bf28642182ecf719efb2ce5a78d7c48409e40434 100644
--- a/influxdb/1.7/data/alpine/Dockerfile
+++ b/influxdb/1.7/data/alpine/Dockerfile
@@ -4,13 +4,9 @@ RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
RUN apk add --no-cache tzdata bash ca-certificates gnupg && \
update-ca-certificates
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV INFLUXDB_VERSION 1.7.11-c1.7.11
RUN set -ex && \
diff --git a/influxdb/1.7/meta/Dockerfile b/influxdb/1.7/meta/Dockerfile
index de409a4fdbbdebef7242e3f21021b060dea04557..6f79fd6a6519dbbc75a2383c6af789b21ab536ab 100644
--- a/influxdb/1.7/meta/Dockerfile
+++ b/influxdb/1.7/meta/Dockerfile
@@ -1,12 +1,8 @@
FROM buildpack-deps:bullseye-curl
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV INFLUXDB_VERSION 1.7.11-c1.7.11
RUN wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta_${INFLUXDB_VERSION}_amd64.deb.asc && \
diff --git a/influxdb/1.7/meta/alpine/Dockerfile b/influxdb/1.7/meta/alpine/Dockerfile
index 2833e01d1f8c9c1c4568851dba673a36775ed3a5..c158cb921d9770295e459d8daf9f932c3b4d5ab4 100644
--- a/influxdb/1.7/meta/alpine/Dockerfile
+++ b/influxdb/1.7/meta/alpine/Dockerfile
@@ -4,14 +4,9 @@ RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
RUN apk add --no-cache tzdata bash ca-certificates gnupg && \
update-ca-certificates
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
-
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV INFLUXDB_VERSION 1.7.11-c1.7.11
RUN set -ex && \
diff --git a/influxdb/1.8/Dockerfile b/influxdb/1.8/Dockerfile
index 913ece290b56f1c6ed86be78f0cd489f4bc19b1e..0493c1f922f36e36bf2e80f77b656a4f9296c2cf 100644
--- a/influxdb/1.8/Dockerfile
+++ b/influxdb/1.8/Dockerfile
@@ -1,12 +1,8 @@
FROM buildpack-deps:bullseye-curl
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV INFLUXDB_VERSION 1.8.10
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
diff --git a/influxdb/1.8/alpine/Dockerfile b/influxdb/1.8/alpine/Dockerfile
index 499bd15db1cb12480c45e28a20a7c5058eec9427..28bbfdd7495d2c69c75aacf0363921d412b0d4ce 100644
--- a/influxdb/1.8/alpine/Dockerfile
+++ b/influxdb/1.8/alpine/Dockerfile
@@ -4,13 +4,9 @@ RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
RUN apk add --no-cache tzdata bash ca-certificates gnupg && \
update-ca-certificates
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV INFLUXDB_VERSION 1.8.10
RUN set -ex && \
diff --git a/influxdb/1.8/data/Dockerfile b/influxdb/1.8/data/Dockerfile
index 51f190b9c98a17e79857e3460017e7bea58eaaa4..eda5327f1c84d7a54bfb4e3d80e951a5ea79cd89 100644
--- a/influxdb/1.8/data/Dockerfile
+++ b/influxdb/1.8/data/Dockerfile
@@ -1,12 +1,8 @@
FROM buildpack-deps:bullseye-curl
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV INFLUXDB_VERSION 1.8.10-c1.8.10
RUN wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data_${INFLUXDB_VERSION}_amd64.deb.asc && \
diff --git a/influxdb/1.8/data/alpine/Dockerfile b/influxdb/1.8/data/alpine/Dockerfile
index 00f5aac3c2a58d184d404a99cfa33c4f29785080..305383f54f36f9f7b4629c204b36bb0e52c11f18 100644
--- a/influxdb/1.8/data/alpine/Dockerfile
+++ b/influxdb/1.8/data/alpine/Dockerfile
@@ -4,13 +4,9 @@ RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
RUN apk add --no-cache tzdata bash ca-certificates gnupg && \
update-ca-certificates
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV INFLUXDB_VERSION 1.8.10-c1.8.10
RUN set -ex && \
diff --git a/influxdb/1.8/meta/Dockerfile b/influxdb/1.8/meta/Dockerfile
index 8ea2d04affdb355d920b651ccb224566697fee71..a9ffa37bcfd989fb86407a6fd340ced376485733 100644
--- a/influxdb/1.8/meta/Dockerfile
+++ b/influxdb/1.8/meta/Dockerfile
@@ -1,12 +1,8 @@
FROM buildpack-deps:bullseye-curl
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV INFLUXDB_VERSION 1.8.10-c1.8.10
RUN wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta_${INFLUXDB_VERSION}_amd64.deb.asc && \
diff --git a/influxdb/1.8/meta/alpine/Dockerfile b/influxdb/1.8/meta/alpine/Dockerfile
index 287b80a08c3780e61f6c92ed288825eface41694..29832dddb3c940a790a218d7801ddc7171615c48 100644
--- a/influxdb/1.8/meta/alpine/Dockerfile
+++ b/influxdb/1.8/meta/alpine/Dockerfile
@@ -4,13 +4,9 @@ RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
RUN apk add --no-cache tzdata bash ca-certificates alpine gnupg && \
update-ca-certificates
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV INFLUXDB_VERSION 1.8.10-c1.8.10
RUN set -ex && \
diff --git a/influxdb/1.9/data/Dockerfile b/influxdb/1.9/data/Dockerfile
index 2a46e7e0f315df5e8c6eb7705d2f0136d63334db..fbdb32678f31d5aef2347eaa1a709e9831056e99 100644
--- a/influxdb/1.9/data/Dockerfile
+++ b/influxdb/1.9/data/Dockerfile
@@ -1,12 +1,8 @@
FROM buildpack-deps:bullseye-curl
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV INFLUXDB_VERSION 1.9.8-c1.9.8
RUN wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data_${INFLUXDB_VERSION}_amd64.deb.asc && \
diff --git a/influxdb/1.9/data/alpine/Dockerfile b/influxdb/1.9/data/alpine/Dockerfile
index 87b8a7bbf981fca674c4fd6cd140a718c3221ea7..8216b8069b0951ce198467fd49c30a7e40796b07 100644
--- a/influxdb/1.9/data/alpine/Dockerfile
+++ b/influxdb/1.9/data/alpine/Dockerfile
@@ -4,13 +4,9 @@ RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
RUN apk add --no-cache tzdata bash ca-certificates gnupg && \
update-ca-certificates
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV INFLUXDB_VERSION 1.9.8-c1.9.8
RUN set -ex && \
diff --git a/influxdb/2.0/Dockerfile b/influxdb/2.0/Dockerfile
index 0f7224a91c1853dfd2bb864f494cb06423e15b48..ceaf87a66a816a6c91b1cd5bb063fce5bb01ec13 100644
--- a/influxdb/2.0/Dockerfile
+++ b/influxdb/2.0/Dockerfile
@@ -5,14 +5,10 @@ RUN groupadd -r influxdb --gid=1000 && \
mkdir -p /home/influxdb && \
chown -R influxdb:influxdb /home/influxdb
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- B42F6819007F00F88E364FD4036A9C25BF357DD4 \
- 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
+ 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A
# Install gosu for easy step-down from root.
# https://github.com/tianon/gosu/releases
diff --git a/influxdb/2.0/alpine/Dockerfile b/influxdb/2.0/alpine/Dockerfile
index 555ebb2967f977b02010031712d178c5cd37a5c5..856f44fca36456d1e6cd93085e884069a59a9079 100644
--- a/influxdb/2.0/alpine/Dockerfile
+++ b/influxdb/2.0/alpine/Dockerfile
@@ -9,13 +9,9 @@ RUN addgroup -S -g 1000 influxdb && \
mkdir -p /home/influxdb && \
chown -R influxdb:influxdb /home/influxdb
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A
ENV INFLUXDB_VERSION 2.0.9
RUN set -eux && \
diff --git a/influxdb/2.1/Dockerfile b/influxdb/2.1/Dockerfile
index 43af60f2c419ba2e7138fb3992522896a95fbdd6..279f09d381ffa4e954dd9cc1d1832db21c445c7d 100644
--- a/influxdb/2.1/Dockerfile
+++ b/influxdb/2.1/Dockerfile
@@ -5,14 +5,10 @@ RUN groupadd -r influxdb --gid=1000 && \
mkdir -p /home/influxdb && \
chown -R influxdb:influxdb /home/influxdb
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- B42F6819007F00F88E364FD4036A9C25BF357DD4 \
- 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
+ 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A
# Install gosu for easy step-down from root.
# https://github.com/tianon/gosu/releases
diff --git a/influxdb/2.1/alpine/Dockerfile b/influxdb/2.1/alpine/Dockerfile
index 46920bd73c8221bf3845fe9a63f615c6169a640b..58425b7f4a786dfe79eba493d0d906b6f777562f 100644
--- a/influxdb/2.1/alpine/Dockerfile
+++ b/influxdb/2.1/alpine/Dockerfile
@@ -9,13 +9,9 @@ RUN addgroup -S -g 1000 influxdb && \
mkdir -p /home/influxdb && \
chown -R influxdb:influxdb /home/influxdb
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A
# Install the infuxd server
ENV INFLUXDB_VERSION 2.1.1
diff --git a/influxdb/2.2/Dockerfile b/influxdb/2.2/Dockerfile
index d9cba5d2c78f1932da574dabc0eea62af4b4d1dc..a56c29b02d2676e2103df94d53ededb4873e0dfb 100644
--- a/influxdb/2.2/Dockerfile
+++ b/influxdb/2.2/Dockerfile
@@ -5,14 +5,10 @@ RUN groupadd -r influxdb --gid=1000 && \
mkdir -p /home/influxdb && \
chown -R influxdb:influxdb /home/influxdb
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- B42F6819007F00F88E364FD4036A9C25BF357DD4 \
- 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
+ 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A
# Install gosu for easy step-down from root.
# https://github.com/tianon/gosu/releases
diff --git a/influxdb/2.2/alpine/Dockerfile b/influxdb/2.2/alpine/Dockerfile
index 7dd998fe79786df33d58d1d52f7e794cca33c28b..9739fda57a8bb31e431967335f0d10f5c2717fbe 100644
--- a/influxdb/2.2/alpine/Dockerfile
+++ b/influxdb/2.2/alpine/Dockerfile
@@ -9,13 +9,9 @@ RUN addgroup -S -g 1000 influxdb && \
mkdir -p /home/influxdb && \
chown -R influxdb:influxdb /home/influxdb
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A
# Install the infuxd server
ENV INFLUXDB_VERSION 2.2.0
diff --git a/influxdb/2.3/Dockerfile b/influxdb/2.3/Dockerfile
index d167ed1d416aa3b9d3edb4c33784cbe7ff2df9bf..73b8ddd32ca625ffe3d5c0444cb77cb01892a89d 100644
--- a/influxdb/2.3/Dockerfile
+++ b/influxdb/2.3/Dockerfile
@@ -5,14 +5,10 @@ RUN groupadd -r influxdb --gid=1000 && \
mkdir -p /home/influxdb && \
chown -R influxdb:influxdb /home/influxdb
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- B42F6819007F00F88E364FD4036A9C25BF357DD4 \
- 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
+ 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A
# Install gosu for easy step-down from root.
# https://github.com/tianon/gosu/releases
diff --git a/influxdb/2.3/alpine/Dockerfile b/influxdb/2.3/alpine/Dockerfile
index 79c78689878bc4dfededc887f7e1de96d440d60d..4897cbdb7ce7c9cc62e46345aa03ae1eb85cb16d 100644
--- a/influxdb/2.3/alpine/Dockerfile
+++ b/influxdb/2.3/alpine/Dockerfile
@@ -9,13 +9,9 @@ RUN addgroup -S -g 1000 influxdb && \
mkdir -p /home/influxdb && \
chown -R influxdb:influxdb /home/influxdb
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A
# Install the infuxd server
ENV INFLUXDB_VERSION 2.3.0
diff --git a/influxdb/2.4/Dockerfile b/influxdb/2.4/Dockerfile
index a33d39567efcb2cc65f879fe87af2e3325641859..b9a9d61326c5010b2bf5121f0eeb142f0ae1da2d 100644
--- a/influxdb/2.4/Dockerfile
+++ b/influxdb/2.4/Dockerfile
@@ -5,14 +5,10 @@ RUN groupadd -r influxdb --gid=1000 && \
mkdir -p /home/influxdb && \
chown -R influxdb:influxdb /home/influxdb
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- B42F6819007F00F88E364FD4036A9C25BF357DD4 \
- 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
+ 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A
# Install gosu for easy step-down from root.
# https://github.com/tianon/gosu/releases
diff --git a/influxdb/2.4/alpine/Dockerfile b/influxdb/2.4/alpine/Dockerfile
index 6a89e82cb7eefdebf033119ceb528e3b092dd8a7..13d8177a37dd0f4bd8b58b3df1df708ceb604204 100644
--- a/influxdb/2.4/alpine/Dockerfile
+++ b/influxdb/2.4/alpine/Dockerfile
@@ -9,13 +9,9 @@ RUN addgroup -S -g 1000 influxdb && \
mkdir -p /home/influxdb && \
chown -R influxdb:influxdb /home/influxdb
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A
# Install the infuxd server
ENV INFLUXDB_VERSION 2.4.0
diff --git a/kapacitor/1.4/Dockerfile b/kapacitor/1.4/Dockerfile
index 0735dc89c0d40f559a0450795a88f258e0e447a1..89f2bdad0fb31daa7ab00ce83ebfe198eb1c99f5 100644
--- a/kapacitor/1.4/Dockerfile
+++ b/kapacitor/1.4/Dockerfile
@@ -5,13 +5,9 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
awk 'f{if(sub(/^#/,"",$0)==0){f=0}};/^# enable bash completion/{f=1};{print;}' /etc/bash.bashrc > /etc/bash.bashrc.new && \
mv /etc/bash.bashrc.new /etc/bash.bashrc
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV KAPACITOR_VERSION 1.4.1
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
diff --git a/kapacitor/1.4/alpine/Dockerfile b/kapacitor/1.4/alpine/Dockerfile
index e29bda13ef247b36a228dba70b446b87ccd71817..446ab12a1465a295312235bc3322171174ca8d5c 100644
--- a/kapacitor/1.4/alpine/Dockerfile
+++ b/kapacitor/1.4/alpine/Dockerfile
@@ -4,13 +4,9 @@ RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
RUN apk add --no-cache ca-certificates gnupg && \
update-ca-certificates
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV KAPACITOR_VERSION 1.4.1
diff --git a/kapacitor/1.5/Dockerfile b/kapacitor/1.5/Dockerfile
index ea6ab68a87ab91847da0013e8d96224eec327a2f..beb82afe1a2be73099c8fac27dd294401615bf73 100644
--- a/kapacitor/1.5/Dockerfile
+++ b/kapacitor/1.5/Dockerfile
@@ -5,13 +5,9 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
awk 'f{if(sub(/^#/,"",$0)==0){f=0}};/^# enable bash completion/{f=1};{print;}' /etc/bash.bashrc > /etc/bash.bashrc.new && \
mv /etc/bash.bashrc.new /etc/bash.bashrc
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV KAPACITOR_VERSION 1.5.9
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
diff --git a/kapacitor/1.5/alpine/Dockerfile b/kapacitor/1.5/alpine/Dockerfile
index 0814345c775ee62054db513cddaaa5641f9b04c0..100eede1b5cf364114bf541dd0bdcf3a4f88d5a2 100644
--- a/kapacitor/1.5/alpine/Dockerfile
+++ b/kapacitor/1.5/alpine/Dockerfile
@@ -4,13 +4,9 @@ RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
RUN apk add --no-cache ca-certificates gnupg && \
update-ca-certificates
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV KAPACITOR_VERSION 1.5.9
diff --git a/kapacitor/1.6/Dockerfile b/kapacitor/1.6/Dockerfile
index 2a5ec767a8bb75a04d652e6ba2ea187aa05dcb44..14c560d1cd32dc0bff00036299444fece457e9d5 100644
--- a/kapacitor/1.6/Dockerfile
+++ b/kapacitor/1.6/Dockerfile
@@ -5,13 +5,9 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
awk 'f{if(sub(/^#/,"",$0)==0){f=0}};/^# enable bash completion/{f=1};{print;}' /etc/bash.bashrc > /etc/bash.bashrc.new && \
mv /etc/bash.bashrc.new /etc/bash.bashrc
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV KAPACITOR_VERSION 1.6.5
diff --git a/kapacitor/1.6/alpine/Dockerfile b/kapacitor/1.6/alpine/Dockerfile
index 2e47412329b24c20fe5d0c4baafe268756f3d043..4d0b22c3c59547477c5053a4c743b02d26885e17 100644
--- a/kapacitor/1.6/alpine/Dockerfile
+++ b/kapacitor/1.6/alpine/Dockerfile
@@ -4,13 +4,9 @@ RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
RUN apk add --no-cache ca-certificates gnupg && \
update-ca-certificates
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV KAPACITOR_VERSION 1.6.5
diff --git a/telegraf/1.21/Dockerfile b/telegraf/1.21/Dockerfile
index 272f24388ed76f1b6ee499d55bc2ab00915045de..53f16b73c8028c9815eeab90ec06984c789e431c 100644
--- a/telegraf/1.21/Dockerfile
+++ b/telegraf/1.21/Dockerfile
@@ -1,17 +1,19 @@
FROM buildpack-deps:bullseye-curl
-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 export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get install \
+ --yes --no-install-recommends \
+ iputils-ping \
+ libcap2-bin \
+ lm-sensors \
+ procps \
+ snmp && \
+ 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
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV TELEGRAF_VERSION 1.21.4
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
diff --git a/telegraf/1.21/alpine/Dockerfile b/telegraf/1.21/alpine/Dockerfile
index eac58559a98dca334ffc25e5c1c2d394e8a39e06..00a0a7327d307310fbaa28ec6c82abb4bc7d7bf0 100644
--- a/telegraf/1.21/alpine/Dockerfile
+++ b/telegraf/1.21/alpine/Dockerfile
@@ -1,16 +1,21 @@
FROM alpine:3.15
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 gnupg && \
+RUN apk add --no-cache \
+ ca-certificates \
+ gnupg \
+ iputils \
+ libcap \
+ lm_sensors \
+ net-snmp-tools \
+ procps \
+ su-exec \
+ tzdata && \
update-ca-certificates
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV TELEGRAF_VERSION 1.21.4
diff --git a/telegraf/1.22/Dockerfile b/telegraf/1.22/Dockerfile
index 61850b3b0715f7e6b6cc222406b0bebddc66009e..81e401fe2c3be40b9c38ba4284a100a8bf8c4c64 100644
--- a/telegraf/1.22/Dockerfile
+++ b/telegraf/1.22/Dockerfile
@@ -1,16 +1,19 @@
FROM buildpack-deps:bullseye-curl
-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 export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get install \
+ --yes --no-install-recommends \
+ iputils-ping \
+ libcap2-bin \
+ lm-sensors \
+ procps \
+ snmp && \
+ rm -rf /var/lib/apt/lists
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV TELEGRAF_VERSION 1.22.4
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
diff --git a/telegraf/1.22/alpine/Dockerfile b/telegraf/1.22/alpine/Dockerfile
index 3c15115759b59b69b23e6c17c39a8d280e3f08f2..8668ade2f846ae43ffb9e5d44c6534b26248cce6 100644
--- a/telegraf/1.22/alpine/Dockerfile
+++ b/telegraf/1.22/alpine/Dockerfile
@@ -1,16 +1,21 @@
FROM alpine:3.16
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 gnupg && \
+RUN apk add --no-cache \
+ ca-certificates \
+ gnupg \
+ iputils \
+ libcap \
+ lm_sensors \
+ net-snmp-tools \
+ procps \
+ su-exec \
+ tzdata && \
update-ca-certificates
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV TELEGRAF_VERSION 1.22.4
diff --git a/telegraf/1.23/Dockerfile b/telegraf/1.23/Dockerfile
index 412a4df395e04a176eaface776423a9a7fd4713f..c79b7464c0b3a410e95dd107da72a9e208c11714 100644
--- a/telegraf/1.23/Dockerfile
+++ b/telegraf/1.23/Dockerfile
@@ -1,16 +1,19 @@
FROM buildpack-deps:bullseye-curl
-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 export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get install \
+ --yes --no-install-recommends \
+ iputils-ping \
+ libcap2-bin \
+ lm-sensors \
+ procps \
+ snmp && \
+ rm -rf /var/lib/apt/lists
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV TELEGRAF_VERSION 1.23.4
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
diff --git a/telegraf/1.23/alpine/Dockerfile b/telegraf/1.23/alpine/Dockerfile
index 40a6e878919c3a384556e0a2324dd693008cdd1d..830124f675b89d76e14e1f5ca7f357a3f813d3a2 100644
--- a/telegraf/1.23/alpine/Dockerfile
+++ b/telegraf/1.23/alpine/Dockerfile
@@ -1,16 +1,21 @@
FROM alpine:3.16
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 gnupg && \
+RUN apk add --no-cache \
+ ca-certificates \
+ gnupg \
+ iputils \
+ libcap \
+ lm_sensors \
+ net-snmp-tools \
+ procps \
+ su-exec \
+ tzdata && \
update-ca-certificates
-RUN for attempt in 1 2 3 ; \
- do \
- sleep 1 && \
- gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
- 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
- break ; \
- done
+RUN gpg --yes --batch \
+ --keyserver hkps://keyserver.ubuntu.com:443 \
+ --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
ENV TELEGRAF_VERSION 1.23.4