Skip to content

Commit fdc01ed

Browse files
bnpfeifebnpfeife
committed
chore: fixup gnupg key fetching logic (influxdb)
1 parent 8e61abf commit fdc01ed

File tree

30 files changed

+268
-267
lines changed

30 files changed

+268
-267
lines changed

‎influxdb/1.10/data/Dockerfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
FROM buildpack-deps:bullseye-curl
22

3-
RUN set -ex && \
4-
mkdir ~/.gnupg; \
5-
echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
6-
for key in \
7-
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
3+
RUN for attempt in 1 2 3 ; \
84
do \
9-
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
5+
sleep 1 && \
6+
gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
7+
05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
8+
break ; \
109
done
1110

1211
ENV INFLUXDB_VERSION 1.10.0-c1.10.0

‎influxdb/1.10/data/alpine/Dockerfile

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

33
RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
4-
RUN apk add --no-cache tzdata bash ca-certificates && \
4+
RUN apk add --no-cache tzdata bash 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 INFLUXDB_VERSION 1.10.0-c1.10.0
816
RUN set -ex && \
9-
apk add --no-cache --virtual .build-deps wget gnupg tar && \
10-
for key in \
11-
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
12-
do \
13-
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
14-
done && \
17+
apk add --no-cache --virtual .build-deps wget tar && \
1518
wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc && \
1619
wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \
1720
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 && \
2023
rm -f /usr/src/influxdb-*/influxdb.conf && \
2124
chmod +x /usr/src/influxdb-*/usr/bin/* && \
2225
cp -a /usr/src/influxdb-*/usr/bin/. /usr/bin/ && \
23-
gpgconf --kill all && \
24-
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
26+
rm -rf *.tar.gz* /usr/src && \
2527
apk del .build-deps
2628
COPY influxdb.conf /etc/influxdb/influxdb.conf
2729

‎influxdb/1.10/meta/Dockerfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
FROM buildpack-deps:bullseye-curl
22

3-
RUN set -ex && \
4-
mkdir ~/.gnupg; \
5-
echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
6-
for key in \
7-
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
3+
RUN for attempt in 1 2 3 ; \
84
do \
9-
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
5+
sleep 1 && \
6+
gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
7+
05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
8+
break ; \
109
done
1110

1211
ENV INFLUXDB_VERSION 1.10.0-c1.10.0

‎influxdb/1.10/meta/alpine/Dockerfile

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

33
RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
4-
RUN apk add --no-cache tzdata bash ca-certificates && \
4+
RUN apk add --no-cache tzdata bash 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 INFLUXDB_VERSION 1.10.0-c1.10.0
816
RUN set -ex && \
917
apk add --no-cache --virtual .build-deps wget gnupg tar && \
10-
for key in \
11-
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
12-
do \
13-
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
14-
done && \
1518
wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc && \
1619
wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \
1720
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 && \
2023
rm -f /usr/src/influxdb-*/influxdb-meta.conf && \
2124
chmod +x /usr/src/influxdb-*/usr/bin/* && \
2225
cp -a /usr/src/influxdb-*/usr/bin/. /usr/bin/ && \
23-
gpgconf --kill all && \
24-
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
26+
rm -rf *.tar.gz* /usr/src && \
2527
apk del .build-deps
2628
COPY influxdb-meta.conf /etc/influxdb/influxdb-meta.conf
2729

‎influxdb/1.7/Dockerfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
FROM buildpack-deps:bullseye-curl
22

3-
RUN set -ex && \
4-
mkdir ~/.gnupg; \
5-
echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
6-
for key in \
7-
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
3+
RUN for attempt in 1 2 3 ; \
84
do \
9-
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
5+
sleep 1 && \
6+
gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
7+
05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
8+
break ; \
109
done
1110

1211
ENV INFLUXDB_VERSION 1.7.11

‎influxdb/1.7/alpine/Dockerfile

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

33
RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
4-
RUN apk add --no-cache tzdata bash ca-certificates && \
4+
RUN apk add --no-cache tzdata bash 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 INFLUXDB_VERSION 1.7.11
816
RUN set -ex && \
9-
mkdir ~/.gnupg; \
10-
echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
11-
apk add --no-cache --virtual .build-deps wget gnupg tar && \
12-
for key in \
13-
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
14-
do \
15-
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
16-
done && \
17+
apk add --no-cache --virtual .build-deps wget tar && \
1718
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc && \
1819
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
1920
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 && \
3031
/usr/src/influxdb-*/influx_tsm \
3132
/usr/src/influxdb-*/influxd \
3233
/usr/bin/ &&\
33-
gpgconf --kill all && \
34-
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
34+
rm -rf *.tar.gz* /usr/src && \
3535
apk del .build-deps
3636
COPY influxdb.conf /etc/influxdb/influxdb.conf
3737

‎influxdb/1.7/data/Dockerfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
FROM buildpack-deps:bullseye-curl
22

3-
RUN set -ex && \
4-
mkdir ~/.gnupg; \
5-
echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
6-
for key in \
7-
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
3+
RUN for attempt in 1 2 3 ; \
84
do \
9-
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
5+
sleep 1 && \
6+
gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
7+
05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
8+
break ; \
109
done
1110

1211
ENV INFLUXDB_VERSION 1.7.11-c1.7.11

‎influxdb/1.7/data/alpine/Dockerfile

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

33
RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
4-
RUN apk add --no-cache tzdata bash ca-certificates && \
4+
RUN apk add --no-cache tzdata bash 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 INFLUXDB_VERSION 1.7.11-c1.7.11
816
RUN set -ex && \
9-
mkdir ~/.gnupg; \
10-
echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
11-
apk add --no-cache --virtual .build-deps wget gnupg tar && \
12-
for key in \
13-
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
14-
do \
15-
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
16-
done && \
17+
apk add --no-cache --virtual .build-deps wget tar && \
1718
wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc && \
1819
wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
1920
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 && \
2223
rm -f /usr/src/influxdb-*/influxdb.conf && \
2324
chmod +x /usr/src/influxdb-*/* && \
2425
cp -a /usr/src/influxdb-*/* /usr/bin/ && \
25-
gpgconf --kill all && \
26-
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
26+
rm -rf *.tar.gz* /usr/src && \
2727
apk del .build-deps
2828
COPY influxdb.conf /etc/influxdb/influxdb.conf
2929

‎influxdb/1.7/meta/Dockerfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
FROM buildpack-deps:bullseye-curl
22

3-
RUN set -ex && \
4-
mkdir ~/.gnupg; \
5-
echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
6-
for key in \
7-
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
3+
RUN for attempt in 1 2 3 ; \
84
do \
9-
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
5+
sleep 1 && \
6+
gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
7+
05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
8+
break ; \
109
done
1110

1211
ENV INFLUXDB_VERSION 1.7.11-c1.7.11

‎influxdb/1.7/meta/alpine/Dockerfile

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

33
RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
4-
RUN apk add --no-cache tzdata bash ca-certificates && \
4+
RUN apk add --no-cache tzdata bash 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+
15+
716
ENV INFLUXDB_VERSION 1.7.11-c1.7.11
817
RUN set -ex && \
9-
mkdir ~/.gnupg; \
10-
echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
11-
apk add --no-cache --virtual .build-deps wget gnupg tar && \
12-
for key in \
13-
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
14-
do \
15-
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
16-
done && \
18+
apk add --no-cache --virtual .build-deps wget tar && \
1719
wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc && \
1820
wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
1921
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 && \
2224
rm -f /usr/src/influxdb-*/influxdb-meta.conf && \
2325
chmod +x /usr/src/influxdb-*/* && \
2426
cp -a /usr/src/influxdb-*/* /usr/bin/ && \
25-
gpgconf --kill all && \
26-
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
27+
rm -rf *.tar.gz* /usr/src && \
2728
apk del .build-deps
2829
COPY influxdb-meta.conf /etc/influxdb/influxdb-meta.conf
2930

0 commit comments

Comments
 (0)