From e22b9e1a54a7e905069e7798905bf5ab5ee0897d Mon Sep 17 00:00:00 2001
From: Brandon Pfeifer <bpfeifer@influxdata.com>
Date: Thu, 1 Sep 2022 17:12:21 -0400
Subject: [PATCH] chore: only try gpg key-recv once
---
chronograf/1.10/Dockerfile | 27 +++++++++++++--------------
chronograf/1.10/alpine/Dockerfile | 18 +++++++-----------
chronograf/1.6/Dockerfile | 25 +++++++++++--------------
chronograf/1.6/alpine/Dockerfile | 10 +++-------
chronograf/1.7/Dockerfile | 25 +++++++++++--------------
chronograf/1.7/alpine/Dockerfile | 10 +++-------
chronograf/1.8/Dockerfile | 25 +++++++++++--------------
chronograf/1.8/alpine/Dockerfile | 10 +++-------
chronograf/1.9/Dockerfile | 25 +++++++++++--------------
chronograf/1.9/alpine/Dockerfile | 10 +++-------
influxdb/1.10/data/Dockerfile | 10 +++-------
influxdb/1.10/data/alpine/Dockerfile | 10 +++-------
influxdb/1.10/meta/Dockerfile | 10 +++-------
influxdb/1.10/meta/alpine/Dockerfile | 10 +++-------
influxdb/1.7/Dockerfile | 10 +++-------
influxdb/1.7/alpine/Dockerfile | 10 +++-------
influxdb/1.7/data/Dockerfile | 10 +++-------
influxdb/1.7/data/alpine/Dockerfile | 10 +++-------
influxdb/1.7/meta/Dockerfile | 10 +++-------
influxdb/1.7/meta/alpine/Dockerfile | 11 +++--------
influxdb/1.8/Dockerfile | 10 +++-------
influxdb/1.8/alpine/Dockerfile | 10 +++-------
influxdb/1.8/data/Dockerfile | 10 +++-------
influxdb/1.8/data/alpine/Dockerfile | 10 +++-------
influxdb/1.8/meta/Dockerfile | 10 +++-------
influxdb/1.8/meta/alpine/Dockerfile | 10 +++-------
influxdb/1.9/data/Dockerfile | 10 +++-------
influxdb/1.9/data/alpine/Dockerfile | 10 +++-------
influxdb/2.0/Dockerfile | 12 ++++--------
influxdb/2.0/alpine/Dockerfile | 10 +++-------
influxdb/2.1/Dockerfile | 12 ++++--------
influxdb/2.1/alpine/Dockerfile | 10 +++-------
influxdb/2.2/Dockerfile | 12 ++++--------
influxdb/2.2/alpine/Dockerfile | 10 +++-------
influxdb/2.3/Dockerfile | 12 ++++--------
influxdb/2.3/alpine/Dockerfile | 10 +++-------
influxdb/2.4/Dockerfile | 12 ++++--------
influxdb/2.4/alpine/Dockerfile | 10 +++-------
kapacitor/1.4/Dockerfile | 10 +++-------
kapacitor/1.4/alpine/Dockerfile | 10 +++-------
kapacitor/1.5/Dockerfile | 10 +++-------
kapacitor/1.5/alpine/Dockerfile | 10 +++-------
kapacitor/1.6/Dockerfile | 10 +++-------
kapacitor/1.6/alpine/Dockerfile | 10 +++-------
telegraf/1.21/Dockerfile | 24 +++++++++++++-----------
telegraf/1.21/alpine/Dockerfile | 21 +++++++++++++--------
telegraf/1.22/Dockerfile | 23 +++++++++++++----------
telegraf/1.22/alpine/Dockerfile | 21 +++++++++++++--------
telegraf/1.23/Dockerfile | 23 +++++++++++++----------
telegraf/1.23/alpine/Dockerfile | 21 +++++++++++++--------
50 files changed, 261 insertions(+), 408 deletions(-)
diff --git a/chronograf/1.10/Dockerfile b/chronograf/1.10/Dockerfile
index 286703c..cb5fe54 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 9e45826..ca35bd2 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 f2f952b..8b19808 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 582f5ec..d2cb7ff 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 b15a259..e4207c0 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 252107e..643e32a 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 3040e57..dc3b14f 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 1da5d2f..5723423 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 ca5162b..2d8252e 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 e587d5e..eda2f02 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 35a787c..1d54364 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 bcebe9d..476c4bd 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 431121e..568dd87 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 21e322c..b900c75 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 cada269..9417401 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 f5a527f..cebff6b 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 ee7775f..eb072a3 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 fed3f52..bf28642 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 de409a4..6f79fd6 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 2833e01..c158cb9 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 913ece2..0493c1f 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 499bd15..28bbfdd 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 51f190b..eda5327 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 00f5aac..305383f 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 8ea2d04..a9ffa37 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 287b80a..29832dd 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 2a46e7e..fbdb326 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 87b8a7b..8216b80 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 0f7224a..ceaf87a 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 555ebb2..856f44f 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 43af60f..279f09d 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 46920bd..58425b7 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 d9cba5d..a56c29b 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 7dd998f..9739fda 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 d167ed1..73b8ddd 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 79c7868..4897cbd 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 a33d395..b9a9d61 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 6a89e82..13d8177 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 0735dc8..89f2bda 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 e29bda1..446ab12 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 ea6ab68..beb82af 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 0814345..100eede 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 2a5ec76..14c560d 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 2e47412..4d0b22c 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 272f243..53f16b7 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 eac5855..00a0a73 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 61850b3..81e401f 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 3c15115..8668ade 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 412a4df..c79b746 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 40a6e87..830124f 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
--
GitLab