Skip to content

Commit bd795b3

Browse files
bnpfeifebnpfeife
committed
chore: only try gpg key-recv once
1 parent 768932c commit bd795b3

File tree

38 files changed

+165
-311
lines changed

38 files changed

+165
-311
lines changed

‎chronograf/1.10/Dockerfile

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
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 ; \
10-
do \
11-
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
12-
done
3+
RUN apt-get update && \
4+
apt-get install \
5+
--yes \
6+
--no-install-recommends \
7+
ca-certificates \
8+
curl \
9+
gnupg && \
10+
rm -rf /var/lib/apt/lists
11+
12+
RUN gpg --yes --batch \
13+
--keyserver hkps://keyserver.ubuntu.com:443 \
14+
--recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
1315

1416
ENV CHRONOGRAF_VERSION 1.10.0
1517
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
@@ -21,14 +23,11 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
2123
*) echo "Unsupported architecture: ${dpkgArch}"; exit 1;; \
2224
esac && \
2325
set -x && \
24-
apt-get update && apt-get install -y ca-certificates curl --no-install-recommends && \
25-
rm -rf /var/lib/apt/lists/* && \
2626
curl -SLO "https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb.asc" && \
2727
curl -SLO "https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb" && \
2828
gpg --batch --verify chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb.asc chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb && \
2929
dpkg -i chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb && \
30-
rm -f chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb* && \
31-
apt-get purge -y --auto-remove $buildDeps
30+
rm -f chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb*
3231

3332
COPY LICENSE /usr/share/chronograf/LICENSE
3433
COPY agpl-3.0.md /usr/share/chronograf/agpl-3.0.md

‎chronograf/1.10/alpine/Dockerfile

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
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 gpg --yes --batch \
8+
--keyserver hkps://keyserver.ubuntu.com:443 \
9+
--recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
10+
711
ENV CHRONOGRAF_VERSION 1.10.0
812

913
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 && \
14+
apk add --no-cache --virtual .build-deps wget tar && \
1815
wget --no-verbose https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc && \
1916
wget --no-verbose https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
2017
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 && \
2320
rm -f /usr/src/chronograf-*/chronograf.conf && \
2421
chmod +x /usr/src/chronograf-*/* && \
2522
cp -a /usr/src/chronograf-*/* /usr/bin/ && \
26-
gpgconf --kill all && \
27-
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
23+
rm -rf *.tar.gz* /usr/src && \
2824
apk del .build-deps
2925

3026
COPY LICENSE /usr/share/chronograf/LICENSE

‎chronograf/1.6/Dockerfile

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

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/*
3+
RUN apt-get update && \
4+
apt-get install \
5+
--yes \
6+
--no-install-recommends \
7+
ca-certificates \
8+
curl \
9+
gnupg && \
10+
rm -rf /var/lib/apt/lists
1011

11-
RUN for attempt in 1 2 3 ; \
12-
do \
13-
sleep 1 && \
14-
gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
15-
05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
16-
break ; \
17-
done
12+
RUN gpg --yes --batch \
13+
--keyserver hkps://keyserver.ubuntu.com:443 \
14+
--recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
1815

1916
ENV CHRONOGRAF_VERSION 1.6.2
2017
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \

‎chronograf/1.6/alpine/Dockerfile

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,9 @@ RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
44
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
7+
RUN gpg --yes --batch \
8+
--keyserver hkps://keyserver.ubuntu.com:443 \
9+
--recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
1410

1511
ENV CHRONOGRAF_VERSION 1.6.2
1612

‎chronograf/1.7/Dockerfile

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

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/*
3+
RUN apt-get update && \
4+
apt-get install \
5+
--yes \
6+
--no-install-recommends \
7+
ca-certificates \
8+
curl \
9+
gnupg && \
10+
rm -rf /var/lib/apt/lists
1011

11-
RUN for attempt in 1 2 3 ; \
12-
do \
13-
sleep 1 && \
14-
gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
15-
05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
16-
break ; \
17-
done
12+
RUN gpg --yes --batch \
13+
--keyserver hkps://keyserver.ubuntu.com:443 \
14+
--recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
1815

1916
ENV CHRONOGRAF_VERSION 1.7.17
2017
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \

‎chronograf/1.7/alpine/Dockerfile

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,9 @@ RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
44
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
7+
RUN gpg --yes --batch \
8+
--keyserver hkps://keyserver.ubuntu.com:443 \
9+
--recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
1410

1511
ENV CHRONOGRAF_VERSION 1.7.17
1612
RUN set -ex && \

‎chronograf/1.8/Dockerfile

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

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/*
3+
RUN apt-get update && \
4+
apt-get install \
5+
--yes \
6+
--no-install-recommends \
7+
ca-certificates \
8+
curl \
9+
gnupg && \
10+
rm -rf /var/lib/apt/lists
1011

11-
RUN for attempt in 1 2 3 ; \
12-
do \
13-
sleep 1 && \
14-
gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
15-
05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
16-
break ; \
17-
done
12+
RUN gpg --yes --batch \
13+
--keyserver hkps://keyserver.ubuntu.com:443 \
14+
--recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
1815

1916
ENV CHRONOGRAF_VERSION 1.8.10
2017
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \

‎chronograf/1.8/alpine/Dockerfile

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,9 @@ RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
44
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
7+
RUN gpg --yes --batch \
8+
--keyserver hkps://keyserver.ubuntu.com:443 \
9+
--recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
1410

1511
ENV CHRONOGRAF_VERSION 1.8.10
1612

‎chronograf/1.9/Dockerfile

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

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/*
3+
RUN apt-get update && \
4+
apt-get install \
5+
--yes \
6+
--no-install-recommends \
7+
ca-certificates \
8+
curl \
9+
gnupg && \
10+
rm -rf /var/lib/apt/lists
1011

11-
RUN for attempt in 1 2 3 ; \
12-
do \
13-
sleep 1 && \
14-
gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
15-
05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
16-
break ; \
17-
done
12+
RUN gpg --yes --batch \
13+
--keyserver hkps://keyserver.ubuntu.com:443 \
14+
--recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
1815

1916
ENV CHRONOGRAF_VERSION 1.9.4
2017
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \

‎chronograf/1.9/alpine/Dockerfile

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,9 @@ RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
44
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
7+
RUN gpg --yes --batch \
8+
--keyserver hkps://keyserver.ubuntu.com:443 \
9+
--recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
1410

1511
ENV CHRONOGRAF_VERSION 1.9.4
1612

0 commit comments

Comments
 (0)