chore: only try gpg key-recv once

e22b9e1a · Brandon Pfeifer · 768932c9 · e22b9e1a · e22b9e1a · e22b9e1a
Commit e22b9e1a authored Sep 1, 2022 by Brandon Pfeifer
--- a/chronograf/1.10/Dockerfile
+++ b/chronograf/1.10/Dockerfile
 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


--- a/chronograf/1.10/alpine/Dockerfile
+++ b/chronograf/1.10/alpine/Dockerfile
 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


--- a/chronograf/1.6/Dockerfile
+++ b/chronograf/1.6/Dockerfile
 FROM debian:bullseye-slim

 RUN apt-get update            && \
-    apt-get install --no-install-recommends -y \
+    apt-get install           \
+      --yes                   \
+      --no-install-recommends \
        ca-certificates       \
        curl                  \
-      dirmngr \
        gnupg                 && \
-    rm -rf /var/lib/apt/lists/*
+    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)" && \


--- 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



--- a/chronograf/1.7/Dockerfile
+++ b/chronograf/1.7/Dockerfile
 FROM debian:bullseye-slim

 RUN apt-get update            && \
-    apt-get install --no-install-recommends -y \
+    apt-get install           \
+      --yes                   \
+      --no-install-recommends \
        ca-certificates       \
        curl                  \
-      dirmngr \
        gnupg                 && \
-    rm -rf /var/lib/apt/lists/*
+    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)" && \


--- 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 && \


--- a/chronograf/1.8/Dockerfile
+++ b/chronograf/1.8/Dockerfile
 FROM debian:bullseye-slim

 RUN apt-get update            && \
-    apt-get install --no-install-recommends -y \
+    apt-get install           \
+      --yes                   \
+      --no-install-recommends \
        ca-certificates       \
        curl                  \
-      dirmngr \
        gnupg                 && \
-    rm -rf /var/lib/apt/lists/*
+    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)" && \


--- 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



--- a/chronograf/1.9/Dockerfile
+++ b/chronograf/1.9/Dockerfile
 FROM debian:bullseye-slim

 RUN apt-get update            && \
-    apt-get install --no-install-recommends -y \
+    apt-get install           \
+      --yes                   \
+      --no-install-recommends \
        ca-certificates       \
        curl                  \
-      dirmngr \
        gnupg                 && \
-    rm -rf /var/lib/apt/lists/*
+    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)" && \


--- 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



--- a/influxdb/1.10/data/Dockerfile
+++ b/influxdb/1.10/data/Dockerfile
 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 && \


--- 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 && \


--- a/influxdb/1.10/meta/Dockerfile
+++ b/influxdb/1.10/meta/Dockerfile
 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 && \


--- 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 && \


--- a/influxdb/1.7/Dockerfile
+++ b/influxdb/1.7/Dockerfile
 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)" && \


--- 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 && \


--- a/influxdb/1.7/data/Dockerfile
+++ b/influxdb/1.7/data/Dockerfile
 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 && \


--- 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 && \


--- a/influxdb/1.7/meta/Dockerfile
+++ b/influxdb/1.7/meta/Dockerfile
 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 && \


--- 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 && \