Skip to content

Commit 263e1ce

Browse files
bnpfeifebnpfeife
committed
chore: fixup gnupg key fetching logic (chronograf)
1 parent fdc01ed commit 263e1ce

File tree

8 files changed

+100
-91
lines changed

8 files changed

+100
-91
lines changed

‎chronograf/1.6/Dockerfile‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
FROM debian:bullseye-slim
22

3-
RUN set -ex && \
4-
mkdir ~/.gnupg; \
5-
echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
6-
apt-get update && apt-get install -y gnupg ca-certificates dirmngr --no-install-recommends && \
7-
rm -rf /var/lib/apt/lists/* && \
8-
for key in \
9-
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
3+
RUN apt-get update && \
4+
apt-get install --no-install-recommends -y \
5+
ca-certificates \
6+
curl \
7+
dirmngr \
8+
gnupg && \
9+
rm -rf /var/lib/apt/lists/*
10+
11+
RUN for attempt in 1 2 3 ; \
1012
do \
11-
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
13+
sleep 1 && \
14+
gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
15+
05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
16+
break ; \
1217
done
1318

1419
ENV CHRONOGRAF_VERSION 1.6.2
@@ -21,14 +26,11 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
2126
*) echo "Unsupported architecture: ${dpkgArch}"; exit 1;; \
2227
esac && \
2328
set -x && \
24-
apt-get update && apt-get install -y ca-certificates curl --no-install-recommends && \
25-
rm -rf /var/lib/apt/lists/* && \
2629
curl -SLO "https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb.asc" && \
2730
curl -SLO "https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb" && \
2831
gpg --batch --verify chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb.asc chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb && \
2932
dpkg -i chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb && \
30-
rm -f chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb* && \
31-
apt-get purge -y --auto-remove $buildDeps
33+
rm -f chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb*
3234

3335
COPY LICENSE /usr/share/chronograf/LICENSE
3436
COPY agpl-3.0.md /usr/share/chronograf/agpl-3.0.md

‎chronograf/1.6/alpine/Dockerfile‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
FROM alpine:3.14
22

33
RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
4-
RUN apk add --no-cache ca-certificates && \
4+
RUN apk add --no-cache ca-certificates gnupg && \
55
update-ca-certificates
66

7+
RUN for attempt in 1 2 3 ; \
8+
do \
9+
sleep 1 && \
10+
gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
11+
05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
12+
break ; \
13+
done
14+
715
ENV CHRONOGRAF_VERSION 1.6.2
816

917
RUN set -ex && \
10-
mkdir ~/.gnupg; \
11-
echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
12-
apk add --no-cache --virtual .build-deps wget gnupg tar && \
13-
for key in \
14-
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
15-
do \
16-
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
17-
done && \
18+
apk add --no-cache --virtual .build-deps wget tar && \
1819
wget --no-verbose https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc && \
1920
wget --no-verbose https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
2021
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 && \
2324
rm -f /usr/src/chronograf-*/chronograf.conf && \
2425
chmod +x /usr/src/chronograf-*/* && \
2526
cp -a /usr/src/chronograf-*/* /usr/bin/ && \
26-
gpgconf --kill all && \
27-
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
27+
rm -rf *.tar.gz* /usr/src && \
2828
apk del .build-deps
2929

3030
COPY LICENSE /usr/share/chronograf/LICENSE

‎chronograf/1.7/Dockerfile‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
FROM debian:bullseye-slim
22

3-
RUN set -ex && \
4-
mkdir ~/.gnupg; \
5-
echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
6-
apt-get update && apt-get install -y gnupg dirmngr --no-install-recommends && \
7-
rm -rf /var/lib/apt/lists/* && \
8-
for key in \
9-
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
3+
RUN apt-get update && \
4+
apt-get install --no-install-recommends -y \
5+
ca-certificates \
6+
curl \
7+
dirmngr \
8+
gnupg && \
9+
rm -rf /var/lib/apt/lists/*
10+
11+
RUN for attempt in 1 2 3 ; \
1012
do \
11-
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
13+
sleep 1 && \
14+
gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
15+
05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
16+
break ; \
1217
done
1318

1419
ENV CHRONOGRAF_VERSION 1.7.17
@@ -27,8 +32,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
2732
curl -SLO "https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb" && \
2833
gpg --batch --verify chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb.asc chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb && \
2934
dpkg -i chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb && \
30-
rm -f chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb* && \
31-
apt-get purge -y --auto-remove $buildDeps
35+
rm -f chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb*
3236

3337
COPY LICENSE /usr/share/chronograf/LICENSE
3438
COPY agpl-3.0.md /usr/share/chronograf/agpl-3.0.md

‎chronograf/1.7/alpine/Dockerfile‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
FROM alpine:3.14
22

33
RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
4-
RUN apk add --no-cache ca-certificates && \
4+
RUN apk add --no-cache ca-certificates gnupg && \
55
update-ca-certificates
66

7-
ENV CHRONOGRAF_VERSION 1.7.17
7+
RUN for attempt in 1 2 3 ; \
8+
do \
9+
sleep 1 && \
10+
gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
11+
05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
12+
break ; \
13+
done
814

15+
ENV CHRONOGRAF_VERSION 1.7.17
916
RUN set -ex && \
10-
mkdir ~/.gnupg; \
11-
echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
12-
apk add --no-cache --virtual .build-deps wget gnupg tar && \
13-
for key in \
14-
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
15-
do \
16-
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
17-
done && \
17+
apk add --no-cache --virtual .build-deps wget tar && \
1818
wget --no-verbose https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc && \
1919
wget --no-verbose https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
2020
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 && \
2323
rm -f /usr/src/chronograf-*/chronograf.conf && \
2424
chmod +x /usr/src/chronograf-*/* && \
2525
cp -a /usr/src/chronograf-*/* /usr/bin/ && \
26-
gpgconf --kill all && \
27-
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
26+
rm -rf *.tar.gz* /usr/src && \
2827
apk del .build-deps
2928

3029
COPY LICENSE /usr/share/chronograf/LICENSE

‎chronograf/1.8/Dockerfile‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
FROM debian:bullseye-slim
22

3-
RUN set -ex && \
4-
mkdir ~/.gnupg; \
5-
echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
6-
apt-get update && apt-get install -y gnupg ca-certificates dirmngr --no-install-recommends && \
7-
rm -rf /var/lib/apt/lists/* && \
8-
for key in \
9-
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
3+
RUN apt-get update && \
4+
apt-get install --no-install-recommends -y \
5+
ca-certificates \
6+
curl \
7+
dirmngr \
8+
gnupg && \
9+
rm -rf /var/lib/apt/lists/*
10+
11+
RUN for attempt in 1 2 3 ; \
1012
do \
11-
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
13+
sleep 1 && \
14+
gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
15+
05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
16+
break ; \
1217
done
1318

1419
ENV CHRONOGRAF_VERSION 1.8.10
@@ -21,14 +26,11 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
2126
*) echo "Unsupported architecture: ${dpkgArch}"; exit 1;; \
2227
esac && \
2328
set -x && \
24-
apt-get update && apt-get install -y ca-certificates curl --no-install-recommends && \
25-
rm -rf /var/lib/apt/lists/* && \
2629
curl -SLO "https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb.asc" && \
2730
curl -SLO "https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb" && \
2831
gpg --batch --verify chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb.asc chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb && \
2932
dpkg -i chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb && \
30-
rm -f chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb* && \
31-
apt-get purge -y --auto-remove $buildDeps
33+
rm -f chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb*
3234

3335
COPY LICENSE /usr/share/chronograf/LICENSE
3436
COPY agpl-3.0.md /usr/share/chronograf/agpl-3.0.md

‎chronograf/1.8/alpine/Dockerfile‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
FROM alpine:3.14
22

33
RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
4-
RUN apk add --no-cache ca-certificates && \
4+
RUN apk add --no-cache ca-certificates gnupg && \
55
update-ca-certificates
66

7+
RUN for attempt in 1 2 3 ; \
8+
do \
9+
sleep 1 && \
10+
gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
11+
05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
12+
break ; \
13+
done
14+
715
ENV CHRONOGRAF_VERSION 1.8.10
816

917
RUN set -ex && \
10-
mkdir ~/.gnupg; \
11-
echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
12-
apk add --no-cache --virtual .build-deps wget gnupg tar && \
13-
for key in \
14-
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
15-
do \
16-
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
17-
done && \
18+
apk add --no-cache --virtual .build-deps wget tar && \
1819
wget --no-verbose https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc && \
1920
wget --no-verbose https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
2021
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 && \
2324
rm -f /usr/src/chronograf-*/chronograf.conf && \
2425
chmod +x /usr/src/chronograf-*/* && \
2526
cp -a /usr/src/chronograf-*/* /usr/bin/ && \
26-
gpgconf --kill all && \
27-
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
27+
rm -rf *.tar.gz* /usr/src && \
2828
apk del .build-deps
2929

3030
COPY LICENSE /usr/share/chronograf/LICENSE

‎chronograf/1.9/Dockerfile‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
FROM debian:bullseye-slim
22

3-
RUN set -ex && \
4-
mkdir ~/.gnupg; \
5-
echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
6-
apt-get update && apt-get install -y gnupg ca-certificates dirmngr --no-install-recommends && \
7-
rm -rf /var/lib/apt/lists/* && \
8-
for key in \
9-
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
3+
RUN apt-get update && \
4+
apt-get install --no-install-recommends -y \
5+
ca-certificates \
6+
curl \
7+
dirmngr \
8+
gnupg && \
9+
rm -rf /var/lib/apt/lists/*
10+
11+
RUN for attempt in 1 2 3 ; \
1012
do \
11-
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
13+
sleep 1 && \
14+
gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
15+
05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
16+
break ; \
1217
done
1318

1419
ENV CHRONOGRAF_VERSION 1.9.4
@@ -21,14 +26,11 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
2126
*) echo "Unsupported architecture: ${dpkgArch}"; exit 1;; \
2227
esac && \
2328
set -x && \
24-
apt-get update && apt-get install -y ca-certificates curl --no-install-recommends && \
25-
rm -rf /var/lib/apt/lists/* && \
2629
curl -SLO "https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb.asc" && \
2730
curl -SLO "https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb" && \
2831
gpg --batch --verify chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb.asc chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb && \
2932
dpkg -i chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb && \
30-
rm -f chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb* && \
31-
apt-get purge -y --auto-remove $buildDeps
33+
rm -f chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb*
3234

3335
COPY LICENSE /usr/share/chronograf/LICENSE
3436
COPY agpl-3.0.md /usr/share/chronograf/agpl-3.0.md

‎chronograf/1.9/alpine/Dockerfile‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
FROM alpine:3.14
22

33
RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
4-
RUN apk add --no-cache ca-certificates && \
4+
RUN apk add --no-cache ca-certificates gnupg && \
55
update-ca-certificates
66

7+
RUN for attempt in 1 2 3 ; \
8+
do \
9+
sleep 1 && \
10+
gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
11+
05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
12+
break ; \
13+
done
14+
715
ENV CHRONOGRAF_VERSION 1.9.4
816

917
RUN set -ex && \
10-
mkdir ~/.gnupg; \
11-
echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
12-
apk add --no-cache --virtual .build-deps wget gnupg tar && \
13-
for key in \
14-
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
15-
do \
16-
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
17-
done && \
18+
apk add --no-cache --virtual .build-deps wget tar && \
1819
wget --no-verbose https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc && \
1920
wget --no-verbose https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
2021
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 && \
2324
rm -f /usr/src/chronograf-*/chronograf.conf && \
2425
chmod +x /usr/src/chronograf-*/* && \
2526
cp -a /usr/src/chronograf-*/* /usr/bin/ && \
26-
gpgconf --kill all && \
27-
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
27+
rm -rf *.tar.gz* /usr/src && \
2828
apk del .build-deps
2929

3030
COPY LICENSE /usr/share/chronograf/LICENSE

0 commit comments

Comments
 (0)