Skip to content

Commit

Permalink
chore: only try gpg key-recv once
Browse files Browse the repository at this point in the history
  • Loading branch information
@bnpfeife
bnpfeife committed Sep 1, 2022
1 parent 768932c commit bd795b3
Show file tree
Hide file tree
Showing 38 changed files with 165 additions and 311 deletions.
27 changes: 13 additions & 14 deletions chronograf/1.10/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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)" && \
Expand All @@ -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
Expand Down
18 changes: 7 additions & 11 deletions chronograf/1.10/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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 && \
Expand All @@ -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
Expand Down
25 changes: 11 additions & 14 deletions chronograf/1.6/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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)" && \
Expand Down
10 changes: 3 additions & 7 deletions chronograf/1.6/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
25 changes: 11 additions & 14 deletions chronograf/1.7/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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)" && \
Expand Down
10 changes: 3 additions & 7 deletions chronograf/1.7/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
25 changes: 11 additions & 14 deletions chronograf/1.8/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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)" && \
Expand Down
10 changes: 3 additions & 7 deletions chronograf/1.8/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
25 changes: 11 additions & 14 deletions chronograf/1.9/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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)" && \
Expand Down
10 changes: 3 additions & 7 deletions chronograf/1.9/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 3 additions & 7 deletions influxdb/1.10/data/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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 && \
Expand Down
10 changes: 3 additions & 7 deletions influxdb/1.10/data/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
10 changes: 3 additions & 7 deletions influxdb/1.10/meta/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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 && \
Expand Down
10 changes: 3 additions & 7 deletions influxdb/1.10/meta/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
10 changes: 3 additions & 7 deletions influxdb/1.7/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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)" && \
Expand Down
10 changes: 3 additions & 7 deletions influxdb/1.7/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
10 changes: 3 additions & 7 deletions influxdb/1.7/data/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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 && \
Expand Down
Loading

0 comments on commit bd795b3

Please sign in to comment.