diff --git a/chronograf/1.10/Dockerfile b/chronograf/1.10/Dockerfile index 286703ca4..cb5fe545c 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 9e4582661..ca35bd2c6 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 f2f952b73..8b1980894 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 582f5eca3..d2cb7ff55 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 b15a259cf..e4207c025 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 252107ec1..643e32a2a 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 3040e5764..dc3b14fb6 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 1da5d2f80..572342302 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 ca5162b5f..2d8252eea 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 e587d5ef3..eda2f0271 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 35a787cc1..1d5436424 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 bcebe9d71..476c4bde3 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 431121ec4..568dd8795 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 21e322c6a..b900c75c7 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 cada26909..9417401d4 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 f5a527f45..cebff6bf3 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 ee7775f9e..eb072a3ba 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 fed3f528f..bf2864218 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 de409a4fd..6f79fd6a6 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 2833e01d1..c158cb921 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 913ece290..0493c1f92 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 499bd15db..28bbfdd74 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 51f190b9c..eda5327f1 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 00f5aac3c..305383f54 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 8ea2d04af..a9ffa37bc 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 287b80a08..29832dddb 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 2a46e7e0f..fbdb32678 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 87b8a7bbf..8216b8069 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 0f7224a91..ceaf87a66 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 555ebb296..856f44fca 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 43af60f2c..279f09d38 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 46920bd73..58425b7f4 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 d9cba5d2c..a56c29b02 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 7dd998fe7..9739fda57 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 d167ed1d4..73b8ddd32 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 79c786898..4897cbdb7 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 a33d39567..b9a9d6132 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 6a89e82cb..13d8177a3 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