From f6be170702006077af7004cd68efec45845b492a Mon Sep 17 00:00:00 2001 From: Brandon Pfeifer Date: Thu, 1 Sep 2022 13:02:14 -0400 Subject: [PATCH 1/8] chore: upgrade images from "stretch" to "bullseye" --- influxdb/1.7/Dockerfile | 2 +- influxdb/1.7/data/Dockerfile | 2 +- influxdb/1.7/meta/Dockerfile | 2 +- kapacitor/1.4/Dockerfile | 2 +- kapacitor/1.5/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/influxdb/1.7/Dockerfile b/influxdb/1.7/Dockerfile index 174d73c7d..5dd3a7366 100644 --- a/influxdb/1.7/Dockerfile +++ b/influxdb/1.7/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps:stretch-curl +FROM buildpack-deps:bullseye-curl RUN set -ex && \ mkdir ~/.gnupg; \ diff --git a/influxdb/1.7/data/Dockerfile b/influxdb/1.7/data/Dockerfile index 17fd41d56..f21b9e3e2 100644 --- a/influxdb/1.7/data/Dockerfile +++ b/influxdb/1.7/data/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps:stretch-curl +FROM buildpack-deps:bullseye-curl RUN set -ex && \ mkdir ~/.gnupg; \ diff --git a/influxdb/1.7/meta/Dockerfile b/influxdb/1.7/meta/Dockerfile index 9ac9fdc03..d11bb798d 100644 --- a/influxdb/1.7/meta/Dockerfile +++ b/influxdb/1.7/meta/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps:stretch-curl +FROM buildpack-deps:bullseye-curl RUN set -ex && \ mkdir ~/.gnupg; \ diff --git a/kapacitor/1.4/Dockerfile b/kapacitor/1.4/Dockerfile index ad48f417d..6ae03bceb 100644 --- a/kapacitor/1.4/Dockerfile +++ b/kapacitor/1.4/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps:stretch-curl +FROM buildpack-deps:bullseye-curl RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y bash-completion && \ diff --git a/kapacitor/1.5/Dockerfile b/kapacitor/1.5/Dockerfile index e5fe7afc5..9b06d9527 100644 --- a/kapacitor/1.5/Dockerfile +++ b/kapacitor/1.5/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps:stretch-curl +FROM buildpack-deps:bullseye-curl RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y bash-completion && \ From 8e61abf9af5895a3ca51360f7c36fe6bf989064c Mon Sep 17 00:00:00 2001 From: Brandon Pfeifer Date: Thu, 1 Sep 2022 16:32:04 -0400 Subject: [PATCH 2/8] chore: upgrade images from "buster" to "bullseye" --- influxdb/2.0/Dockerfile | 2 +- influxdb/2.1/Dockerfile | 2 +- influxdb/2.2/Dockerfile | 2 +- influxdb/2.3/Dockerfile | 2 +- influxdb/2.4/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/influxdb/2.0/Dockerfile b/influxdb/2.0/Dockerfile index 9f0d75b2d..d85afe109 100644 --- a/influxdb/2.0/Dockerfile +++ b/influxdb/2.0/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps:buster-curl +FROM buildpack-deps:bullseye-curl RUN groupadd -r influxdb --gid=1000 && \ useradd -r -g influxdb --uid=1000 --home-dir=/home/influxdb --shell=/bin/bash influxdb && \ diff --git a/influxdb/2.1/Dockerfile b/influxdb/2.1/Dockerfile index c38feff62..2cfb1508b 100644 --- a/influxdb/2.1/Dockerfile +++ b/influxdb/2.1/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps:buster-curl +FROM buildpack-deps:bullseye-curl RUN groupadd -r influxdb --gid=1000 && \ useradd -r -g influxdb --uid=1000 --home-dir=/home/influxdb --shell=/bin/bash influxdb && \ diff --git a/influxdb/2.2/Dockerfile b/influxdb/2.2/Dockerfile index ece8710c9..d786ce8d9 100644 --- a/influxdb/2.2/Dockerfile +++ b/influxdb/2.2/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps:buster-curl +FROM buildpack-deps:bullseye-curl RUN groupadd -r influxdb --gid=1000 && \ useradd -r -g influxdb --uid=1000 --home-dir=/home/influxdb --shell=/bin/bash influxdb && \ diff --git a/influxdb/2.3/Dockerfile b/influxdb/2.3/Dockerfile index 0a3d97936..21682957d 100644 --- a/influxdb/2.3/Dockerfile +++ b/influxdb/2.3/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps:buster-curl +FROM buildpack-deps:bullseye-curl RUN groupadd -r influxdb --gid=1000 && \ useradd -r -g influxdb --uid=1000 --home-dir=/home/influxdb --shell=/bin/bash influxdb && \ diff --git a/influxdb/2.4/Dockerfile b/influxdb/2.4/Dockerfile index c996cec8e..4f566ce1d 100644 --- a/influxdb/2.4/Dockerfile +++ b/influxdb/2.4/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps:buster-curl +FROM buildpack-deps:bullseye-curl RUN groupadd -r influxdb --gid=1000 && \ useradd -r -g influxdb --uid=1000 --home-dir=/home/influxdb --shell=/bin/bash influxdb && \ From fdc01ed68e81cfbe68638e7839c18e9245377197 Mon Sep 17 00:00:00 2001 From: Brandon Pfeifer Date: Wed, 24 Aug 2022 11:20:48 -0400 Subject: [PATCH 3/8] chore: fixup gnupg key fetching logic (influxdb) --- influxdb/1.10/data/Dockerfile | 11 +++++------ influxdb/1.10/data/alpine/Dockerfile | 20 +++++++++++--------- influxdb/1.10/meta/Dockerfile | 11 +++++------ influxdb/1.10/meta/alpine/Dockerfile | 18 ++++++++++-------- influxdb/1.7/Dockerfile | 11 +++++------ influxdb/1.7/alpine/Dockerfile | 22 +++++++++++----------- influxdb/1.7/data/Dockerfile | 11 +++++------ influxdb/1.7/data/alpine/Dockerfile | 22 +++++++++++----------- influxdb/1.7/meta/Dockerfile | 11 +++++------ influxdb/1.7/meta/alpine/Dockerfile | 23 ++++++++++++----------- influxdb/1.8/Dockerfile | 11 +++++------ influxdb/1.8/alpine/Dockerfile | 22 +++++++++++----------- influxdb/1.8/data/Dockerfile | 11 +++++------ influxdb/1.8/data/alpine/Dockerfile | 20 +++++++++++--------- influxdb/1.8/meta/Dockerfile | 11 +++++------ influxdb/1.8/meta/alpine/Dockerfile | 20 +++++++++++--------- influxdb/1.9/data/Dockerfile | 11 +++++------ influxdb/1.9/data/alpine/Dockerfile | 20 +++++++++++--------- influxdb/1.9/meta/Dockerfile | 11 +++++------ influxdb/1.9/meta/alpine/Dockerfile | 20 +++++++++++--------- influxdb/2.0/Dockerfile | 20 +++++++++++--------- influxdb/2.0/alpine/Dockerfile | 14 +++++++++----- influxdb/2.1/Dockerfile | 26 ++++++++++++-------------- influxdb/2.1/alpine/Dockerfile | 20 ++++++++++---------- influxdb/2.2/Dockerfile | 26 ++++++++++++-------------- influxdb/2.2/alpine/Dockerfile | 20 ++++++++++---------- influxdb/2.3/Dockerfile | 26 ++++++++++++-------------- influxdb/2.3/alpine/Dockerfile | 20 ++++++++++---------- influxdb/2.4/Dockerfile | 26 ++++++++++++-------------- influxdb/2.4/alpine/Dockerfile | 20 ++++++++++---------- 30 files changed, 268 insertions(+), 267 deletions(-) diff --git a/influxdb/1.10/data/Dockerfile b/influxdb/1.10/data/Dockerfile index d871a7803..35a787cc1 100644 --- a/influxdb/1.10/data/Dockerfile +++ b/influxdb/1.10/data/Dockerfile @@ -1,12 +1,11 @@ FROM buildpack-deps:bullseye-curl -RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ +RUN for attempt in 1 2 3 ; \ do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ + sleep 1 && \ + gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \ + 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \ + break ; \ done ENV INFLUXDB_VERSION 1.10.0-c1.10.0 diff --git a/influxdb/1.10/data/alpine/Dockerfile b/influxdb/1.10/data/alpine/Dockerfile index 8b73fe498..bcebe9d71 100644 --- a/influxdb/1.10/data/alpine/Dockerfile +++ b/influxdb/1.10/data/alpine/Dockerfile @@ -1,17 +1,20 @@ FROM alpine:3.14 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf -RUN apk add --no-cache tzdata bash ca-certificates && \ +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 + ENV INFLUXDB_VERSION 1.10.0-c1.10.0 RUN set -ex && \ - 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/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \ gpg --batch --verify influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \ @@ -20,8 +23,7 @@ RUN set -ex && \ rm -f /usr/src/influxdb-*/influxdb.conf && \ chmod +x /usr/src/influxdb-*/usr/bin/* && \ cp -a /usr/src/influxdb-*/usr/bin/. /usr/bin/ && \ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps COPY influxdb.conf /etc/influxdb/influxdb.conf diff --git a/influxdb/1.10/meta/Dockerfile b/influxdb/1.10/meta/Dockerfile index 578efbcd3..431121ec4 100644 --- a/influxdb/1.10/meta/Dockerfile +++ b/influxdb/1.10/meta/Dockerfile @@ -1,12 +1,11 @@ FROM buildpack-deps:bullseye-curl -RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ +RUN for attempt in 1 2 3 ; \ do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ + sleep 1 && \ + gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \ + 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \ + break ; \ done ENV INFLUXDB_VERSION 1.10.0-c1.10.0 diff --git a/influxdb/1.10/meta/alpine/Dockerfile b/influxdb/1.10/meta/alpine/Dockerfile index bebab5dc4..21e322c6a 100644 --- a/influxdb/1.10/meta/alpine/Dockerfile +++ b/influxdb/1.10/meta/alpine/Dockerfile @@ -1,17 +1,20 @@ FROM alpine:3.14 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf -RUN apk add --no-cache tzdata bash ca-certificates && \ +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 + ENV INFLUXDB_VERSION 1.10.0-c1.10.0 RUN set -ex && \ 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 && \ wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \ gpg --batch --verify influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \ @@ -20,8 +23,7 @@ RUN set -ex && \ rm -f /usr/src/influxdb-*/influxdb-meta.conf && \ chmod +x /usr/src/influxdb-*/usr/bin/* && \ cp -a /usr/src/influxdb-*/usr/bin/. /usr/bin/ && \ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps COPY influxdb-meta.conf /etc/influxdb/influxdb-meta.conf diff --git a/influxdb/1.7/Dockerfile b/influxdb/1.7/Dockerfile index 5dd3a7366..cada26909 100644 --- a/influxdb/1.7/Dockerfile +++ b/influxdb/1.7/Dockerfile @@ -1,12 +1,11 @@ FROM buildpack-deps:bullseye-curl -RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ +RUN for attempt in 1 2 3 ; \ do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ + sleep 1 && \ + gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \ + 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \ + break ; \ done ENV INFLUXDB_VERSION 1.7.11 diff --git a/influxdb/1.7/alpine/Dockerfile b/influxdb/1.7/alpine/Dockerfile index 9a464c6dd..f5a527f45 100644 --- a/influxdb/1.7/alpine/Dockerfile +++ b/influxdb/1.7/alpine/Dockerfile @@ -1,19 +1,20 @@ FROM alpine:3.14 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf -RUN apk add --no-cache tzdata bash ca-certificates && \ +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 + ENV INFLUXDB_VERSION 1.7.11 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/influxdb/releases/influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \ gpg --batch --verify influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \ @@ -30,8 +31,7 @@ RUN set -ex && \ /usr/src/influxdb-*/influx_tsm \ /usr/src/influxdb-*/influxd \ /usr/bin/ &&\ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps COPY influxdb.conf /etc/influxdb/influxdb.conf diff --git a/influxdb/1.7/data/Dockerfile b/influxdb/1.7/data/Dockerfile index f21b9e3e2..ee7775f9e 100644 --- a/influxdb/1.7/data/Dockerfile +++ b/influxdb/1.7/data/Dockerfile @@ -1,12 +1,11 @@ FROM buildpack-deps:bullseye-curl -RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ +RUN for attempt in 1 2 3 ; \ do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ + sleep 1 && \ + gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \ + 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \ + break ; \ done ENV INFLUXDB_VERSION 1.7.11-c1.7.11 diff --git a/influxdb/1.7/data/alpine/Dockerfile b/influxdb/1.7/data/alpine/Dockerfile index 5f3dedca7..fed3f528f 100644 --- a/influxdb/1.7/data/alpine/Dockerfile +++ b/influxdb/1.7/data/alpine/Dockerfile @@ -1,19 +1,20 @@ FROM alpine:3.14 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf -RUN apk add --no-cache tzdata bash ca-certificates && \ +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 + ENV INFLUXDB_VERSION 1.7.11-c1.7.11 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/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \ gpg --batch --verify influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \ @@ -22,8 +23,7 @@ RUN set -ex && \ rm -f /usr/src/influxdb-*/influxdb.conf && \ chmod +x /usr/src/influxdb-*/* && \ cp -a /usr/src/influxdb-*/* /usr/bin/ && \ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps COPY influxdb.conf /etc/influxdb/influxdb.conf diff --git a/influxdb/1.7/meta/Dockerfile b/influxdb/1.7/meta/Dockerfile index d11bb798d..de409a4fd 100644 --- a/influxdb/1.7/meta/Dockerfile +++ b/influxdb/1.7/meta/Dockerfile @@ -1,12 +1,11 @@ FROM buildpack-deps:bullseye-curl -RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ +RUN for attempt in 1 2 3 ; \ do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ + sleep 1 && \ + gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \ + 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \ + break ; \ done ENV INFLUXDB_VERSION 1.7.11-c1.7.11 diff --git a/influxdb/1.7/meta/alpine/Dockerfile b/influxdb/1.7/meta/alpine/Dockerfile index c43561f55..2833e01d1 100644 --- a/influxdb/1.7/meta/alpine/Dockerfile +++ b/influxdb/1.7/meta/alpine/Dockerfile @@ -1,19 +1,21 @@ FROM alpine:3.14 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf -RUN apk add --no-cache tzdata bash ca-certificates && \ +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 + + ENV INFLUXDB_VERSION 1.7.11-c1.7.11 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/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \ gpg --batch --verify influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \ @@ -22,8 +24,7 @@ RUN set -ex && \ rm -f /usr/src/influxdb-*/influxdb-meta.conf && \ chmod +x /usr/src/influxdb-*/* && \ cp -a /usr/src/influxdb-*/* /usr/bin/ && \ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps COPY influxdb-meta.conf /etc/influxdb/influxdb-meta.conf diff --git a/influxdb/1.8/Dockerfile b/influxdb/1.8/Dockerfile index 47e969333..913ece290 100644 --- a/influxdb/1.8/Dockerfile +++ b/influxdb/1.8/Dockerfile @@ -1,12 +1,11 @@ FROM buildpack-deps:bullseye-curl -RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ +RUN for attempt in 1 2 3 ; \ do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ + sleep 1 && \ + gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \ + 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \ + break ; \ done ENV INFLUXDB_VERSION 1.8.10 diff --git a/influxdb/1.8/alpine/Dockerfile b/influxdb/1.8/alpine/Dockerfile index 929fa7415..499bd15db 100644 --- a/influxdb/1.8/alpine/Dockerfile +++ b/influxdb/1.8/alpine/Dockerfile @@ -1,19 +1,20 @@ FROM alpine:3.14 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf -RUN apk add --no-cache tzdata bash ca-certificates && \ +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 + ENV INFLUXDB_VERSION 1.8.10 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/influxdb/releases/influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \ gpg --batch --verify influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \ @@ -28,8 +29,7 @@ RUN set -ex && \ /usr/src/influxdb-*/influx_stress \ /usr/src/influxdb-*/influxd \ /usr/bin/ &&\ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps COPY influxdb.conf /etc/influxdb/influxdb.conf diff --git a/influxdb/1.8/data/Dockerfile b/influxdb/1.8/data/Dockerfile index 829dfc772..51f190b9c 100644 --- a/influxdb/1.8/data/Dockerfile +++ b/influxdb/1.8/data/Dockerfile @@ -1,12 +1,11 @@ FROM buildpack-deps:bullseye-curl -RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ +RUN for attempt in 1 2 3 ; \ do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ + sleep 1 && \ + gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \ + 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \ + break ; \ done ENV INFLUXDB_VERSION 1.8.10-c1.8.10 diff --git a/influxdb/1.8/data/alpine/Dockerfile b/influxdb/1.8/data/alpine/Dockerfile index 8e1df408a..00f5aac3c 100644 --- a/influxdb/1.8/data/alpine/Dockerfile +++ b/influxdb/1.8/data/alpine/Dockerfile @@ -1,17 +1,20 @@ FROM alpine:3.14 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf -RUN apk add --no-cache tzdata bash ca-certificates && \ +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 + ENV INFLUXDB_VERSION 1.8.10-c1.8.10 RUN set -ex && \ - 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/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \ gpg --batch --verify influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \ @@ -20,8 +23,7 @@ RUN set -ex && \ rm -f /usr/src/influxdb-*/influxdb.conf && \ chmod +x /usr/src/influxdb-*/* && \ cp -a /usr/src/influxdb-*/* /usr/bin/ && \ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps COPY influxdb.conf /etc/influxdb/influxdb.conf diff --git a/influxdb/1.8/meta/Dockerfile b/influxdb/1.8/meta/Dockerfile index e8bed10d6..8ea2d04af 100644 --- a/influxdb/1.8/meta/Dockerfile +++ b/influxdb/1.8/meta/Dockerfile @@ -1,12 +1,11 @@ FROM buildpack-deps:bullseye-curl -RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ +RUN for attempt in 1 2 3 ; \ do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ + sleep 1 && \ + gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \ + 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \ + break ; \ done ENV INFLUXDB_VERSION 1.8.10-c1.8.10 diff --git a/influxdb/1.8/meta/alpine/Dockerfile b/influxdb/1.8/meta/alpine/Dockerfile index 566380d4e..287b80a08 100644 --- a/influxdb/1.8/meta/alpine/Dockerfile +++ b/influxdb/1.8/meta/alpine/Dockerfile @@ -1,17 +1,20 @@ FROM alpine:3.14 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf -RUN apk add --no-cache tzdata bash ca-certificates && \ +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 + ENV INFLUXDB_VERSION 1.8.10-c1.8.10 RUN set -ex && \ - 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/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \ gpg --batch --verify influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \ @@ -20,8 +23,7 @@ RUN set -ex && \ rm -f /usr/src/influxdb-*/influxdb-meta.conf && \ chmod +x /usr/src/influxdb-*/* && \ cp -a /usr/src/influxdb-*/* /usr/bin/ && \ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps COPY influxdb-meta.conf /etc/influxdb/influxdb-meta.conf diff --git a/influxdb/1.9/data/Dockerfile b/influxdb/1.9/data/Dockerfile index 74591ae63..2a46e7e0f 100644 --- a/influxdb/1.9/data/Dockerfile +++ b/influxdb/1.9/data/Dockerfile @@ -1,12 +1,11 @@ FROM buildpack-deps:bullseye-curl -RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ +RUN for attempt in 1 2 3 ; \ do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ + sleep 1 && \ + gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \ + 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \ + break ; \ done ENV INFLUXDB_VERSION 1.9.8-c1.9.8 diff --git a/influxdb/1.9/data/alpine/Dockerfile b/influxdb/1.9/data/alpine/Dockerfile index 2d5f58c45..87b8a7bbf 100644 --- a/influxdb/1.9/data/alpine/Dockerfile +++ b/influxdb/1.9/data/alpine/Dockerfile @@ -1,17 +1,20 @@ FROM alpine:3.14 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf -RUN apk add --no-cache tzdata bash ca-certificates && \ +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 + ENV INFLUXDB_VERSION 1.9.8-c1.9.8 RUN set -ex && \ - 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/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \ gpg --batch --verify influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \ @@ -20,8 +23,7 @@ RUN set -ex && \ rm -f /usr/src/influxdb-*/etc/influxdb/influxdb.conf && \ chmod +x /usr/src/influxdb-*/usr/bin/* && \ cp -a /usr/src/influxdb-*/usr/bin/. /usr/bin/ && \ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps COPY influxdb.conf /etc/influxdb/influxdb.conf diff --git a/influxdb/1.9/meta/Dockerfile b/influxdb/1.9/meta/Dockerfile index b8682b280..9dce5312d 100644 --- a/influxdb/1.9/meta/Dockerfile +++ b/influxdb/1.9/meta/Dockerfile @@ -1,12 +1,11 @@ FROM buildpack-deps:bullseye-curl -RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ +RUN for attempt in 1 2 3 ; \ do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ + sleep 1 && \ + gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \ + 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \ + break ; \ done ENV INFLUXDB_VERSION 1.9.8-c1.9.8 diff --git a/influxdb/1.9/meta/alpine/Dockerfile b/influxdb/1.9/meta/alpine/Dockerfile index c5f348606..5077aac53 100644 --- a/influxdb/1.9/meta/alpine/Dockerfile +++ b/influxdb/1.9/meta/alpine/Dockerfile @@ -1,17 +1,20 @@ FROM alpine:3.14 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf -RUN apk add --no-cache tzdata bash ca-certificates && \ +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 + ENV INFLUXDB_VERSION 1.9.8-c1.9.8 RUN set -ex && \ - 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/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \ gpg --batch --verify influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \ @@ -20,8 +23,7 @@ RUN set -ex && \ rm -f /usr/src/influxdb-*/etc/influxdb/influxdb-meta.conf && \ chmod +x /usr/src/influxdb-*/usr/bin/* && \ cp -a /usr/src/influxdb-*/usr/bin/. /usr/bin/ && \ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps COPY influxdb-meta.conf /etc/influxdb/influxdb-meta.conf diff --git a/influxdb/2.0/Dockerfile b/influxdb/2.0/Dockerfile index d85afe109..0f7224a91 100644 --- a/influxdb/2.0/Dockerfile +++ b/influxdb/2.0/Dockerfile @@ -5,6 +5,15 @@ 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 + # Install gosu for easy step-down from root. # https://github.com/tianon/gosu/releases ENV GOSU_VER 1.12 @@ -12,11 +21,8 @@ RUN set -eux; \ dpkgArch="$(dpkg --print-architecture)" && \ wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch" && \ wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch.asc" && \ - export GNUPGHOME="$(mktemp -d)" && \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \ gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc && \ + rm /usr/local/bin/gosu.asc && \ chmod +x /usr/local/bin/gosu && \ gosu --version && \ gosu nobody true @@ -31,14 +37,10 @@ RUN set -eux && \ esac && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ - gpgconf --kill all && \ tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}/influx* /usr/local/bin/ && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ influxd version && \ influx version diff --git a/influxdb/2.0/alpine/Dockerfile b/influxdb/2.0/alpine/Dockerfile index 49efc3189..555ebb296 100644 --- a/influxdb/2.0/alpine/Dockerfile +++ b/influxdb/2.0/alpine/Dockerfile @@ -9,6 +9,14 @@ 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 + ENV INFLUXDB_VERSION 2.0.9 RUN set -eux && \ ARCH="$(apk --print-arch)" && \ @@ -21,14 +29,10 @@ RUN set -eux && \ fi && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ - gpgconf --kill all && \ tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}/influx* /usr/local/bin/ && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ influxd version && \ influx version diff --git a/influxdb/2.1/Dockerfile b/influxdb/2.1/Dockerfile index 2cfb1508b..43af60f2c 100644 --- a/influxdb/2.1/Dockerfile +++ b/influxdb/2.1/Dockerfile @@ -5,6 +5,15 @@ 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 + # Install gosu for easy step-down from root. # https://github.com/tianon/gosu/releases ENV GOSU_VER 1.12 @@ -12,11 +21,8 @@ RUN set -eux; \ dpkgArch="$(dpkg --print-architecture)" && \ wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch" && \ wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch.asc" && \ - export GNUPGHOME="$(mktemp -d)" && \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \ gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc && \ + rm /usr/local/bin/gosu.asc && \ chmod +x /usr/local/bin/gosu && \ gosu --version && \ gosu nobody true @@ -32,14 +38,10 @@ RUN set -eux && \ esac && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}/influxd /usr/local/bin/influxd && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ influxd version # Install the influx CLI @@ -53,14 +55,10 @@ RUN set -eux && \ esac && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \ influx version # Create standard directories expected by the entry-point. diff --git a/influxdb/2.1/alpine/Dockerfile b/influxdb/2.1/alpine/Dockerfile index 260a8fb66..46920bd73 100644 --- a/influxdb/2.1/alpine/Dockerfile +++ b/influxdb/2.1/alpine/Dockerfile @@ -9,6 +9,14 @@ 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 + # Install the infuxd server ENV INFLUXDB_VERSION 2.1.1 RUN set -eux && \ @@ -22,14 +30,10 @@ RUN set -eux && \ fi && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}/influxd /usr/local/bin/influxd && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ influxd version # Install the influx CLI @@ -45,14 +49,10 @@ RUN set -eux && \ fi && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \ influx version # Create standard directories expected by the entry-point. diff --git a/influxdb/2.2/Dockerfile b/influxdb/2.2/Dockerfile index d786ce8d9..d9cba5d2c 100644 --- a/influxdb/2.2/Dockerfile +++ b/influxdb/2.2/Dockerfile @@ -5,6 +5,15 @@ 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 + # Install gosu for easy step-down from root. # https://github.com/tianon/gosu/releases ENV GOSU_VER 1.12 @@ -12,11 +21,8 @@ RUN set -eux; \ dpkgArch="$(dpkg --print-architecture)" && \ wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch" && \ wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch.asc" && \ - export GNUPGHOME="$(mktemp -d)" && \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \ gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc && \ + rm /usr/local/bin/gosu.asc && \ chmod +x /usr/local/bin/gosu && \ gosu --version && \ gosu nobody true @@ -32,14 +38,10 @@ RUN set -eux && \ esac && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}/influxd /usr/local/bin/influxd && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ influxd version # Install the influx CLI @@ -53,14 +55,10 @@ RUN set -eux && \ esac && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \ influx version # Create standard directories expected by the entry-point. diff --git a/influxdb/2.2/alpine/Dockerfile b/influxdb/2.2/alpine/Dockerfile index 3baff7512..7dd998fe7 100644 --- a/influxdb/2.2/alpine/Dockerfile +++ b/influxdb/2.2/alpine/Dockerfile @@ -9,6 +9,14 @@ 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 + # Install the infuxd server ENV INFLUXDB_VERSION 2.2.0 RUN set -eux && \ @@ -22,14 +30,10 @@ RUN set -eux && \ fi && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}/influxd /usr/local/bin/influxd && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ influxd version # Install the influx CLI @@ -45,14 +49,10 @@ RUN set -eux && \ fi && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \ influx version # Create standard directories expected by the entry-point. diff --git a/influxdb/2.3/Dockerfile b/influxdb/2.3/Dockerfile index 21682957d..d167ed1d4 100644 --- a/influxdb/2.3/Dockerfile +++ b/influxdb/2.3/Dockerfile @@ -5,6 +5,15 @@ 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 + # Install gosu for easy step-down from root. # https://github.com/tianon/gosu/releases ENV GOSU_VER 1.12 @@ -12,11 +21,8 @@ RUN set -eux; \ dpkgArch="$(dpkg --print-architecture)" && \ wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch" && \ wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch.asc" && \ - export GNUPGHOME="$(mktemp -d)" && \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \ gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc && \ + rm /usr/local/bin/gosu.asc && \ chmod +x /usr/local/bin/gosu && \ gosu --version && \ gosu nobody true @@ -32,14 +38,10 @@ RUN set -eux && \ esac && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2_linux_${ARCH}/influxd /usr/local/bin/influxd && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ influxd version # Install the influx CLI @@ -53,14 +55,10 @@ RUN set -eux && \ esac && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \ influx version # Create standard directories expected by the entry-point. diff --git a/influxdb/2.3/alpine/Dockerfile b/influxdb/2.3/alpine/Dockerfile index 991698d72..79c786898 100644 --- a/influxdb/2.3/alpine/Dockerfile +++ b/influxdb/2.3/alpine/Dockerfile @@ -9,6 +9,14 @@ 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 + # Install the infuxd server ENV INFLUXDB_VERSION 2.3.0 RUN set -eux && \ @@ -22,14 +30,10 @@ RUN set -eux && \ fi && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2_linux_${ARCH}/influxd /usr/local/bin/influxd && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ influxd version # Install the influx CLI @@ -45,14 +49,10 @@ RUN set -eux && \ fi && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \ influx version # Create standard directories expected by the entry-point. diff --git a/influxdb/2.4/Dockerfile b/influxdb/2.4/Dockerfile index 4f566ce1d..a33d39567 100644 --- a/influxdb/2.4/Dockerfile +++ b/influxdb/2.4/Dockerfile @@ -5,6 +5,15 @@ 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 + # Install gosu for easy step-down from root. # https://github.com/tianon/gosu/releases ENV GOSU_VER 1.12 @@ -12,11 +21,8 @@ RUN set -eux; \ dpkgArch="$(dpkg --print-architecture)" && \ wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch" && \ wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch.asc" && \ - export GNUPGHOME="$(mktemp -d)" && \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \ gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc && \ + rm /usr/local/bin/gosu.asc && \ chmod +x /usr/local/bin/gosu && \ gosu --version && \ gosu nobody true @@ -32,14 +38,10 @@ RUN set -eux && \ esac && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2_linux_${ARCH}/influxd /usr/local/bin/influxd && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ influxd version # Install the influx CLI @@ -53,14 +55,10 @@ RUN set -eux && \ esac && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \ influx version # Create standard directories expected by the entry-point. diff --git a/influxdb/2.4/alpine/Dockerfile b/influxdb/2.4/alpine/Dockerfile index aade1c593..6a89e82cb 100644 --- a/influxdb/2.4/alpine/Dockerfile +++ b/influxdb/2.4/alpine/Dockerfile @@ -9,6 +9,14 @@ 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 + # Install the infuxd server ENV INFLUXDB_VERSION 2.4.0 RUN set -eux && \ @@ -22,14 +30,10 @@ RUN set -eux && \ fi && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2_linux_${ARCH}/influxd /usr/local/bin/influxd && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \ influxd version # Install the influx CLI @@ -45,14 +49,10 @@ RUN set -eux && \ fi && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \ gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" influxdb2.key influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \ + rm -rf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \ influx version # Create standard directories expected by the entry-point. From 263e1cef2c9164dcbd31c174525d460402281473 Mon Sep 17 00:00:00 2001 From: Brandon Pfeifer Date: Wed, 24 Aug 2022 15:04:41 -0400 Subject: [PATCH 4/8] chore: fixup gnupg key fetching logic (chronograf) --- chronograf/1.6/Dockerfile | 26 ++++++++++++++------------ chronograf/1.6/alpine/Dockerfile | 22 +++++++++++----------- chronograf/1.7/Dockerfile | 24 ++++++++++++++---------- chronograf/1.7/alpine/Dockerfile | 23 +++++++++++------------ chronograf/1.8/Dockerfile | 26 ++++++++++++++------------ chronograf/1.8/alpine/Dockerfile | 22 +++++++++++----------- chronograf/1.9/Dockerfile | 26 ++++++++++++++------------ chronograf/1.9/alpine/Dockerfile | 22 +++++++++++----------- 8 files changed, 100 insertions(+), 91 deletions(-) diff --git a/chronograf/1.6/Dockerfile b/chronograf/1.6/Dockerfile index 714f5719a..f2f952b73 100644 --- a/chronograf/1.6/Dockerfile +++ b/chronograf/1.6/Dockerfile @@ -1,14 +1,19 @@ 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 ; \ +RUN apt-get update && \ + apt-get install --no-install-recommends -y \ + ca-certificates \ + curl \ + dirmngr \ + gnupg && \ + rm -rf /var/lib/apt/lists/* + +RUN for attempt in 1 2 3 ; \ do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ + sleep 1 && \ + gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \ + 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \ + break ; \ done ENV CHRONOGRAF_VERSION 1.6.2 @@ -21,14 +26,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.6/alpine/Dockerfile b/chronograf/1.6/alpine/Dockerfile index b102c33fb..582f5eca3 100644 --- a/chronograf/1.6/alpine/Dockerfile +++ b/chronograf/1.6/alpine/Dockerfile @@ -1,20 +1,21 @@ 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 for attempt in 1 2 3 ; \ + do \ + sleep 1 && \ + gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \ + 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \ + break ; \ + done + ENV CHRONOGRAF_VERSION 1.6.2 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 +24,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.7/Dockerfile b/chronograf/1.7/Dockerfile index c2a7599be..b15a259cf 100644 --- a/chronograf/1.7/Dockerfile +++ b/chronograf/1.7/Dockerfile @@ -1,14 +1,19 @@ FROM debian:bullseye-slim -RUN set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - apt-get update && apt-get install -y gnupg dirmngr --no-install-recommends && \ - rm -rf /var/lib/apt/lists/* && \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ +RUN apt-get update && \ + apt-get install --no-install-recommends -y \ + ca-certificates \ + curl \ + dirmngr \ + gnupg && \ + rm -rf /var/lib/apt/lists/* + +RUN for attempt in 1 2 3 ; \ do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ + sleep 1 && \ + gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \ + 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \ + break ; \ done ENV CHRONOGRAF_VERSION 1.7.17 @@ -27,8 +32,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \ 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.7/alpine/Dockerfile b/chronograf/1.7/alpine/Dockerfile index b5bdc8514..252107ec1 100644 --- a/chronograf/1.7/alpine/Dockerfile +++ b/chronograf/1.7/alpine/Dockerfile @@ -1,20 +1,20 @@ 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 -ENV CHRONOGRAF_VERSION 1.7.17 +RUN for attempt in 1 2 3 ; \ + do \ + sleep 1 && \ + gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \ + 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \ + break ; \ + done +ENV CHRONOGRAF_VERSION 1.7.17 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 +23,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.8/Dockerfile b/chronograf/1.8/Dockerfile index c8c16990b..3040e5764 100644 --- a/chronograf/1.8/Dockerfile +++ b/chronograf/1.8/Dockerfile @@ -1,14 +1,19 @@ 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 ; \ +RUN apt-get update && \ + apt-get install --no-install-recommends -y \ + ca-certificates \ + curl \ + dirmngr \ + gnupg && \ + rm -rf /var/lib/apt/lists/* + +RUN for attempt in 1 2 3 ; \ do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ + sleep 1 && \ + gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \ + 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \ + break ; \ done ENV CHRONOGRAF_VERSION 1.8.10 @@ -21,14 +26,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.8/alpine/Dockerfile b/chronograf/1.8/alpine/Dockerfile index f7ef5fde9..1da5d2f80 100644 --- a/chronograf/1.8/alpine/Dockerfile +++ b/chronograf/1.8/alpine/Dockerfile @@ -1,20 +1,21 @@ 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 for attempt in 1 2 3 ; \ + do \ + sleep 1 && \ + gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \ + 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \ + break ; \ + done + ENV CHRONOGRAF_VERSION 1.8.10 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 +24,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.9/Dockerfile b/chronograf/1.9/Dockerfile index 63dbc4f70..ca5162b5f 100644 --- a/chronograf/1.9/Dockerfile +++ b/chronograf/1.9/Dockerfile @@ -1,14 +1,19 @@ 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 ; \ +RUN apt-get update && \ + apt-get install --no-install-recommends -y \ + ca-certificates \ + curl \ + dirmngr \ + gnupg && \ + rm -rf /var/lib/apt/lists/* + +RUN for attempt in 1 2 3 ; \ do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ + sleep 1 && \ + gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \ + 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \ + break ; \ done ENV CHRONOGRAF_VERSION 1.9.4 @@ -21,14 +26,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.9/alpine/Dockerfile b/chronograf/1.9/alpine/Dockerfile index b1d6ca844..e587d5ef3 100644 --- a/chronograf/1.9/alpine/Dockerfile +++ b/chronograf/1.9/alpine/Dockerfile @@ -1,20 +1,21 @@ 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 for attempt in 1 2 3 ; \ + do \ + sleep 1 && \ + gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \ + 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \ + break ; \ + done + ENV CHRONOGRAF_VERSION 1.9.4 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 +24,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 From 2ad6838f271b6235235eab3a652093f0bb5de671 Mon Sep 17 00:00:00 2001 From: Brandon Pfeifer Date: Wed, 24 Aug 2022 15:15:53 -0400 Subject: [PATCH 5/8] chore: fixup gnupg key fetching logic (kapacitor) --- kapacitor/1.4/Dockerfile | 11 +++++------ kapacitor/1.4/alpine/Dockerfile | 22 +++++++++++----------- kapacitor/1.5/Dockerfile | 11 +++++------ kapacitor/1.5/alpine/Dockerfile | 22 +++++++++++----------- kapacitor/1.6/Dockerfile | 13 ++++++++----- kapacitor/1.6/alpine/Dockerfile | 22 +++++++++++----------- 6 files changed, 51 insertions(+), 50 deletions(-) diff --git a/kapacitor/1.4/Dockerfile b/kapacitor/1.4/Dockerfile index 6ae03bceb..0735dc89c 100644 --- a/kapacitor/1.4/Dockerfile +++ b/kapacitor/1.4/Dockerfile @@ -5,13 +5,12 @@ 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 set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ +RUN for attempt in 1 2 3 ; \ do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ + sleep 1 && \ + gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \ + 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \ + break ; \ done ENV KAPACITOR_VERSION 1.4.1 diff --git a/kapacitor/1.4/alpine/Dockerfile b/kapacitor/1.4/alpine/Dockerfile index b88406ce3..e29bda13e 100644 --- a/kapacitor/1.4/alpine/Dockerfile +++ b/kapacitor/1.4/alpine/Dockerfile @@ -1,20 +1,21 @@ 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 for attempt in 1 2 3 ; \ + do \ + sleep 1 && \ + gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \ + 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \ + break ; \ + done + ENV KAPACITOR_VERSION 1.4.1 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/kapacitor/releases/kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/kapacitor/releases/kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz && \ gpg --batch --verify kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz.asc kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz && \ @@ -23,8 +24,7 @@ RUN set -ex && \ rm -f /usr/src/kapacitor-*/kapacitor.conf && \ chmod +x /usr/src/kapacitor-*/* && \ cp -a /usr/src/kapacitor-*/* /usr/bin/ && \ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps COPY kapacitor.conf /etc/kapacitor/kapacitor.conf diff --git a/kapacitor/1.5/Dockerfile b/kapacitor/1.5/Dockerfile index 9b06d9527..ea6ab68a8 100644 --- a/kapacitor/1.5/Dockerfile +++ b/kapacitor/1.5/Dockerfile @@ -5,13 +5,12 @@ 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 set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ +RUN for attempt in 1 2 3 ; \ do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ + sleep 1 && \ + gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \ + 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \ + break ; \ done ENV KAPACITOR_VERSION 1.5.9 diff --git a/kapacitor/1.5/alpine/Dockerfile b/kapacitor/1.5/alpine/Dockerfile index 8560e6225..0814345c7 100644 --- a/kapacitor/1.5/alpine/Dockerfile +++ b/kapacitor/1.5/alpine/Dockerfile @@ -1,20 +1,21 @@ 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 for attempt in 1 2 3 ; \ + do \ + sleep 1 && \ + gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \ + 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \ + break ; \ + done + ENV KAPACITOR_VERSION 1.5.9 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/kapacitor/releases/kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/kapacitor/releases/kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz && \ gpg --batch --verify kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz.asc kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz && \ @@ -23,8 +24,7 @@ RUN set -ex && \ rm -f /usr/src/kapacitor-*/kapacitor.conf && \ chmod +x /usr/src/kapacitor-*/* && \ cp -a /usr/src/kapacitor-*/* /usr/bin/ && \ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps COPY kapacitor.conf /etc/kapacitor/kapacitor.conf diff --git a/kapacitor/1.6/Dockerfile b/kapacitor/1.6/Dockerfile index bbb034400..2a5ec767a 100644 --- a/kapacitor/1.6/Dockerfile +++ b/kapacitor/1.6/Dockerfile @@ -5,6 +5,14 @@ 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 + ENV KAPACITOR_VERSION 1.6.5 RUN set -eux && \ @@ -16,13 +24,8 @@ RUN set -eux && \ esac && \ wget --no-verbose https://dl.influxdata.com/kapacitor/releases/kapacitor_${KAPACITOR_VERSION}-1_${ARCH}.deb.asc && \ wget --no-verbose https://dl.influxdata.com/kapacitor/releases/kapacitor_${KAPACITOR_VERSION}-1_${ARCH}.deb && \ - export GNUPGHOME="$(mktemp -d)" && \ - echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \ - gpg --batch --keyserver hkp://keyserver.ubuntu.com --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \ gpg --batch --verify kapacitor_${KAPACITOR_VERSION}-1_${ARCH}.deb.asc kapacitor_${KAPACITOR_VERSION}-1_${ARCH}.deb && \ - rm -rf "$GNUPGHOME" && \ dpkg -i kapacitor_${KAPACITOR_VERSION}-1_${ARCH}.deb && \ - gpgconf --kill all && \ rm -f kapacitor_${KAPACITOR_VERSION}-1_${ARCH}.deb* COPY kapacitor.conf /etc/kapacitor/kapacitor.conf diff --git a/kapacitor/1.6/alpine/Dockerfile b/kapacitor/1.6/alpine/Dockerfile index 934c2c32b..2e4741232 100644 --- a/kapacitor/1.6/alpine/Dockerfile +++ b/kapacitor/1.6/alpine/Dockerfile @@ -1,28 +1,28 @@ FROM alpine:3.16 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 for attempt in 1 2 3 ; \ + do \ + sleep 1 && \ + gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \ + 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \ + break ; \ + done + ENV KAPACITOR_VERSION 1.6.5 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/kapacitor/releases/kapacitor-${KAPACITOR_VERSION}_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/kapacitor/releases/kapacitor-${KAPACITOR_VERSION}_linux_amd64.tar.gz && \ gpg --batch --verify kapacitor-${KAPACITOR_VERSION}_linux_amd64.tar.gz.asc kapacitor-${KAPACITOR_VERSION}_linux_amd64.tar.gz && \ mkdir -p /usr/src && \ tar -C /usr/src -xzf kapacitor-${KAPACITOR_VERSION}_linux_amd64.tar.gz && \ cp -ar /usr/src/kapacitor-*/* / && \ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps COPY kapacitor.conf /etc/kapacitor/kapacitor.conf EXPOSE 9092 From 768932c9e4ff0c13a056f0dfd29c3768040e031a Mon Sep 17 00:00:00 2001 From: Brandon Pfeifer Date: Wed, 24 Aug 2022 15:31:09 -0400 Subject: [PATCH 6/8] chore: fixup gnupg key fetching logic (telegraf) --- telegraf/1.21/alpine/Dockerfile | 22 +++++++++++----------- telegraf/1.22/Dockerfile | 11 +++++------ telegraf/1.22/alpine/Dockerfile | 22 +++++++++++----------- telegraf/1.23/Dockerfile | 11 +++++------ telegraf/1.23/alpine/Dockerfile | 22 +++++++++++----------- 5 files changed, 43 insertions(+), 45 deletions(-) diff --git a/telegraf/1.21/alpine/Dockerfile b/telegraf/1.21/alpine/Dockerfile index 9bd24647f..eac58559a 100644 --- a/telegraf/1.21/alpine/Dockerfile +++ b/telegraf/1.21/alpine/Dockerfile @@ -1,20 +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 && \ +RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors tzdata su-exec libcap 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 + ENV TELEGRAF_VERSION 1.21.4 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/telegraf/releases/telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/telegraf/releases/telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz && \ gpg --batch --verify telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz.asc telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz && \ @@ -23,8 +24,7 @@ RUN set -ex && \ mv /usr/src/telegraf*/etc/telegraf/telegraf.conf /etc/telegraf/ && \ mkdir /etc/telegraf/telegraf.d && \ cp -a /usr/src/telegraf*/usr/bin/telegraf /usr/bin/ && \ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps && \ addgroup -S telegraf && \ adduser -S telegraf -G telegraf && \ diff --git a/telegraf/1.22/Dockerfile b/telegraf/1.22/Dockerfile index a9fff0463..61850b3b0 100644 --- a/telegraf/1.22/Dockerfile +++ b/telegraf/1.22/Dockerfile @@ -4,13 +4,12 @@ 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 set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ +RUN for attempt in 1 2 3 ; \ do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ + sleep 1 && \ + gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \ + 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \ + break ; \ done ENV TELEGRAF_VERSION 1.22.4 diff --git a/telegraf/1.22/alpine/Dockerfile b/telegraf/1.22/alpine/Dockerfile index c9f746987..3c1511575 100644 --- a/telegraf/1.22/alpine/Dockerfile +++ b/telegraf/1.22/alpine/Dockerfile @@ -1,20 +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 && \ +RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors tzdata su-exec libcap 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 + ENV TELEGRAF_VERSION 1.22.4 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/telegraf/releases/telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/telegraf/releases/telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz && \ gpg --batch --verify telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz.asc telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz && \ @@ -23,8 +24,7 @@ RUN set -ex && \ mv /usr/src/telegraf*/etc/telegraf/telegraf.conf /etc/telegraf/ && \ mkdir /etc/telegraf/telegraf.d && \ cp -a /usr/src/telegraf*/usr/bin/telegraf /usr/bin/ && \ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps && \ addgroup -S telegraf && \ adduser -S telegraf -G telegraf && \ diff --git a/telegraf/1.23/Dockerfile b/telegraf/1.23/Dockerfile index dacd15240..412a4df39 100644 --- a/telegraf/1.23/Dockerfile +++ b/telegraf/1.23/Dockerfile @@ -4,13 +4,12 @@ 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 set -ex && \ - mkdir ~/.gnupg; \ - echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ - for key in \ - 05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \ +RUN for attempt in 1 2 3 ; \ do \ - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \ + sleep 1 && \ + gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \ + 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \ + break ; \ done ENV TELEGRAF_VERSION 1.23.4 diff --git a/telegraf/1.23/alpine/Dockerfile b/telegraf/1.23/alpine/Dockerfile index de7360c7d..40a6e8789 100644 --- a/telegraf/1.23/alpine/Dockerfile +++ b/telegraf/1.23/alpine/Dockerfile @@ -1,20 +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 && \ +RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors tzdata su-exec libcap 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 + ENV TELEGRAF_VERSION 1.23.4 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/telegraf/releases/telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz.asc && \ wget --no-verbose https://dl.influxdata.com/telegraf/releases/telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz && \ gpg --batch --verify telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz.asc telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz && \ @@ -23,8 +24,7 @@ RUN set -ex && \ mv /usr/src/telegraf*/etc/telegraf/telegraf.conf /etc/telegraf/ && \ mkdir /etc/telegraf/telegraf.d && \ cp -a /usr/src/telegraf*/usr/bin/telegraf /usr/bin/ && \ - gpgconf --kill all && \ - rm -rf *.tar.gz* /usr/src /root/.gnupg && \ + rm -rf *.tar.gz* /usr/src && \ apk del .build-deps && \ addgroup -S telegraf && \ adduser -S telegraf -G telegraf && \ From e22b9e1a54a7e905069e7798905bf5ab5ee0897d Mon Sep 17 00:00:00 2001 From: Brandon Pfeifer Date: Thu, 1 Sep 2022 17:12:21 -0400 Subject: [PATCH 7/8] 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 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 diff --git a/kapacitor/1.4/Dockerfile b/kapacitor/1.4/Dockerfile index 0735dc89c..89f2bdad0 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 e29bda13e..446ab12a1 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 ea6ab68a8..beb82afe1 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 0814345c7..100eede1b 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 2a5ec767a..14c560d1c 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 2e4741232..4d0b22c3c 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 272f24388..53f16b73c 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 eac58559a..00a0a7327 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 61850b3b0..81e401fe2 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 3c1511575..8668ade2f 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 412a4df39..c79b7464c 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 40a6e8789..830124f67 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 From e17b3b57abb4dd8702f57e43a5753d0e33940003 Mon Sep 17 00:00:00 2001 From: Brandon Pfeifer Date: Wed, 7 Sep 2022 12:42:20 -0400 Subject: [PATCH 8/8] chore: upgrade alpine to "latest" --- chronograf/1.10/alpine/Dockerfile | 2 +- chronograf/1.6/alpine/Dockerfile | 2 +- chronograf/1.7/alpine/Dockerfile | 2 +- chronograf/1.8/alpine/Dockerfile | 2 +- chronograf/1.9/alpine/Dockerfile | 2 +- influxdb/1.10/data/alpine/Dockerfile | 2 +- influxdb/1.10/meta/alpine/Dockerfile | 2 +- influxdb/1.7/alpine/Dockerfile | 2 +- influxdb/1.7/data/alpine/Dockerfile | 2 +- influxdb/1.7/meta/alpine/Dockerfile | 2 +- influxdb/1.8/alpine/Dockerfile | 2 +- influxdb/1.8/data/alpine/Dockerfile | 2 +- influxdb/1.8/meta/alpine/Dockerfile | 2 +- influxdb/1.9/data/alpine/Dockerfile | 2 +- influxdb/1.9/meta/alpine/Dockerfile | 2 +- influxdb/2.0/alpine/Dockerfile | 2 +- influxdb/2.1/alpine/Dockerfile | 2 +- influxdb/2.2/alpine/Dockerfile | 2 +- influxdb/2.3/alpine/Dockerfile | 2 +- influxdb/2.4/alpine/Dockerfile | 2 +- kapacitor/1.4/alpine/Dockerfile | 2 +- kapacitor/1.5/alpine/Dockerfile | 2 +- kapacitor/1.6/alpine/Dockerfile | 2 +- telegraf/1.21/alpine/Dockerfile | 2 +- telegraf/1.22/alpine/Dockerfile | 2 +- telegraf/1.23/alpine/Dockerfile | 2 +- telegraf/nightly/alpine/Dockerfile | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/chronograf/1.10/alpine/Dockerfile b/chronograf/1.10/alpine/Dockerfile index ca35bd2c6..6d913aaae 100644 --- a/chronograf/1.10/alpine/Dockerfile +++ b/chronograf/1.10/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf RUN apk add --no-cache ca-certificates gnupg && \ diff --git a/chronograf/1.6/alpine/Dockerfile b/chronograf/1.6/alpine/Dockerfile index d2cb7ff55..6edc06f10 100644 --- a/chronograf/1.6/alpine/Dockerfile +++ b/chronograf/1.6/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf RUN apk add --no-cache ca-certificates gnupg && \ diff --git a/chronograf/1.7/alpine/Dockerfile b/chronograf/1.7/alpine/Dockerfile index 643e32a2a..8cb7a4c3b 100644 --- a/chronograf/1.7/alpine/Dockerfile +++ b/chronograf/1.7/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf RUN apk add --no-cache ca-certificates gnupg && \ diff --git a/chronograf/1.8/alpine/Dockerfile b/chronograf/1.8/alpine/Dockerfile index 572342302..3865823e2 100644 --- a/chronograf/1.8/alpine/Dockerfile +++ b/chronograf/1.8/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf RUN apk add --no-cache ca-certificates gnupg && \ diff --git a/chronograf/1.9/alpine/Dockerfile b/chronograf/1.9/alpine/Dockerfile index eda2f0271..28329df16 100644 --- a/chronograf/1.9/alpine/Dockerfile +++ b/chronograf/1.9/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf RUN apk add --no-cache ca-certificates gnupg && \ diff --git a/influxdb/1.10/data/alpine/Dockerfile b/influxdb/1.10/data/alpine/Dockerfile index 476c4bde3..f809647ef 100644 --- a/influxdb/1.10/data/alpine/Dockerfile +++ b/influxdb/1.10/data/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf RUN apk add --no-cache tzdata bash ca-certificates gnupg && \ diff --git a/influxdb/1.10/meta/alpine/Dockerfile b/influxdb/1.10/meta/alpine/Dockerfile index b900c75c7..1aa77d31a 100644 --- a/influxdb/1.10/meta/alpine/Dockerfile +++ b/influxdb/1.10/meta/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf RUN apk add --no-cache tzdata bash ca-certificates gnupg && \ diff --git a/influxdb/1.7/alpine/Dockerfile b/influxdb/1.7/alpine/Dockerfile index cebff6bf3..fcdf2c6ac 100644 --- a/influxdb/1.7/alpine/Dockerfile +++ b/influxdb/1.7/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf RUN apk add --no-cache tzdata bash ca-certificates gnupg && \ diff --git a/influxdb/1.7/data/alpine/Dockerfile b/influxdb/1.7/data/alpine/Dockerfile index bf2864218..b9626c4e8 100644 --- a/influxdb/1.7/data/alpine/Dockerfile +++ b/influxdb/1.7/data/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf RUN apk add --no-cache tzdata bash ca-certificates gnupg && \ diff --git a/influxdb/1.7/meta/alpine/Dockerfile b/influxdb/1.7/meta/alpine/Dockerfile index c158cb921..0e11125f4 100644 --- a/influxdb/1.7/meta/alpine/Dockerfile +++ b/influxdb/1.7/meta/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf RUN apk add --no-cache tzdata bash ca-certificates gnupg && \ diff --git a/influxdb/1.8/alpine/Dockerfile b/influxdb/1.8/alpine/Dockerfile index 28bbfdd74..cfb02d2b2 100644 --- a/influxdb/1.8/alpine/Dockerfile +++ b/influxdb/1.8/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf RUN apk add --no-cache tzdata bash ca-certificates gnupg && \ diff --git a/influxdb/1.8/data/alpine/Dockerfile b/influxdb/1.8/data/alpine/Dockerfile index 305383f54..bff42b62f 100644 --- a/influxdb/1.8/data/alpine/Dockerfile +++ b/influxdb/1.8/data/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf RUN apk add --no-cache tzdata bash ca-certificates gnupg && \ diff --git a/influxdb/1.8/meta/alpine/Dockerfile b/influxdb/1.8/meta/alpine/Dockerfile index 29832dddb..75e3ed716 100644 --- a/influxdb/1.8/meta/alpine/Dockerfile +++ b/influxdb/1.8/meta/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf RUN apk add --no-cache tzdata bash ca-certificates alpine gnupg && \ diff --git a/influxdb/1.9/data/alpine/Dockerfile b/influxdb/1.9/data/alpine/Dockerfile index 8216b8069..f78fae2c3 100644 --- a/influxdb/1.9/data/alpine/Dockerfile +++ b/influxdb/1.9/data/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf RUN apk add --no-cache tzdata bash ca-certificates gnupg && \ diff --git a/influxdb/1.9/meta/alpine/Dockerfile b/influxdb/1.9/meta/alpine/Dockerfile index 5077aac53..dc3e03ea8 100644 --- a/influxdb/1.9/meta/alpine/Dockerfile +++ b/influxdb/1.9/meta/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf RUN apk add --no-cache tzdata bash ca-certificates gnupg && \ diff --git a/influxdb/2.0/alpine/Dockerfile b/influxdb/2.0/alpine/Dockerfile index 856f44fca..bb7700a3e 100644 --- a/influxdb/2.0/alpine/Dockerfile +++ b/influxdb/2.0/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf RUN apk add --no-cache tzdata bash ca-certificates gnupg run-parts su-exec && \ diff --git a/influxdb/2.1/alpine/Dockerfile b/influxdb/2.1/alpine/Dockerfile index 58425b7f4..c9994c649 100644 --- a/influxdb/2.1/alpine/Dockerfile +++ b/influxdb/2.1/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf RUN apk add --no-cache tzdata bash ca-certificates gnupg run-parts su-exec && \ diff --git a/influxdb/2.2/alpine/Dockerfile b/influxdb/2.2/alpine/Dockerfile index 9739fda57..b5fe535be 100644 --- a/influxdb/2.2/alpine/Dockerfile +++ b/influxdb/2.2/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf RUN apk add --no-cache tzdata bash ca-certificates gnupg run-parts su-exec && \ diff --git a/influxdb/2.3/alpine/Dockerfile b/influxdb/2.3/alpine/Dockerfile index 4897cbdb7..666238c8d 100644 --- a/influxdb/2.3/alpine/Dockerfile +++ b/influxdb/2.3/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf RUN apk add --no-cache tzdata bash ca-certificates gnupg run-parts su-exec && \ diff --git a/influxdb/2.4/alpine/Dockerfile b/influxdb/2.4/alpine/Dockerfile index 13d8177a3..163c7b115 100644 --- a/influxdb/2.4/alpine/Dockerfile +++ b/influxdb/2.4/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf RUN apk add --no-cache tzdata bash ca-certificates gnupg run-parts su-exec && \ diff --git a/kapacitor/1.4/alpine/Dockerfile b/kapacitor/1.4/alpine/Dockerfile index 446ab12a1..858b16510 100644 --- a/kapacitor/1.4/alpine/Dockerfile +++ b/kapacitor/1.4/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf RUN apk add --no-cache ca-certificates gnupg && \ diff --git a/kapacitor/1.5/alpine/Dockerfile b/kapacitor/1.5/alpine/Dockerfile index 100eede1b..bbaab4100 100644 --- a/kapacitor/1.5/alpine/Dockerfile +++ b/kapacitor/1.5/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf RUN apk add --no-cache ca-certificates gnupg && \ diff --git a/kapacitor/1.6/alpine/Dockerfile b/kapacitor/1.6/alpine/Dockerfile index 4d0b22c3c..5c06f8d26 100644 --- a/kapacitor/1.6/alpine/Dockerfile +++ b/kapacitor/1.6/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.16 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf RUN apk add --no-cache ca-certificates gnupg && \ diff --git a/telegraf/1.21/alpine/Dockerfile b/telegraf/1.21/alpine/Dockerfile index 00a0a7327..4e79cc832 100644 --- a/telegraf/1.21/alpine/Dockerfile +++ b/telegraf/1.21/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.15 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf RUN apk add --no-cache \ diff --git a/telegraf/1.22/alpine/Dockerfile b/telegraf/1.22/alpine/Dockerfile index 8668ade2f..eccd55e35 100644 --- a/telegraf/1.22/alpine/Dockerfile +++ b/telegraf/1.22/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.16 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf RUN apk add --no-cache \ diff --git a/telegraf/1.23/alpine/Dockerfile b/telegraf/1.23/alpine/Dockerfile index 830124f67..c375fb2b3 100644 --- a/telegraf/1.23/alpine/Dockerfile +++ b/telegraf/1.23/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.16 +FROM alpine:latest RUN echo 'hosts: files dns' >> /etc/nsswitch.conf RUN apk add --no-cache \ diff --git a/telegraf/nightly/alpine/Dockerfile b/telegraf/nightly/alpine/Dockerfile index a58ce247b..dcb851702 100644 --- a/telegraf/nightly/alpine/Dockerfile +++ b/telegraf/nightly/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.16 +FROM alpine:latest 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 && \