Skip to content

Commit 2ad6838

Browse files
bnpfeifebnpfeife
committed
chore: fixup gnupg key fetching logic (kapacitor)
1 parent 263e1ce commit 2ad6838

File tree

6 files changed

+51
-50
lines changed

6 files changed

+51
-50
lines changed

‎kapacitor/1.4/Dockerfile‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
55
awk 'f{if(sub(/^#/,"",$0)==0){f=0}};/^# enable bash completion/{f=1};{print;}' /etc/bash.bashrc > /etc/bash.bashrc.new && \
66
mv /etc/bash.bashrc.new /etc/bash.bashrc
77

8-
RUN set -ex && \
9-
mkdir ~/.gnupg; \
10-
echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
11-
for key in \
12-
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
8+
RUN for attempt in 1 2 3 ; \
139
do \
14-
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
10+
sleep 1 && \
11+
gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
12+
05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
13+
break ; \
1514
done
1615

1716
ENV KAPACITOR_VERSION 1.4.1

‎kapacitor/1.4/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 KAPACITOR_VERSION 1.4.1
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/kapacitor/releases/kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz.asc && \
1920
wget --no-verbose https://dl.influxdata.com/kapacitor/releases/kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz && \
2021
gpg --batch --verify kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz.asc kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz && \
@@ -23,8 +24,7 @@ RUN set -ex && \
2324
rm -f /usr/src/kapacitor-*/kapacitor.conf && \
2425
chmod +x /usr/src/kapacitor-*/* && \
2526
cp -a /usr/src/kapacitor-*/* /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
COPY kapacitor.conf /etc/kapacitor/kapacitor.conf
3030

‎kapacitor/1.5/Dockerfile‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
55
awk 'f{if(sub(/^#/,"",$0)==0){f=0}};/^# enable bash completion/{f=1};{print;}' /etc/bash.bashrc > /etc/bash.bashrc.new && \
66
mv /etc/bash.bashrc.new /etc/bash.bashrc
77

8-
RUN set -ex && \
9-
mkdir ~/.gnupg; \
10-
echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
11-
for key in \
12-
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
8+
RUN for attempt in 1 2 3 ; \
139
do \
14-
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
10+
sleep 1 && \
11+
gpg --yes --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys \
12+
05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
13+
break ; \
1514
done
1615

1716
ENV KAPACITOR_VERSION 1.5.9

‎kapacitor/1.5/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 KAPACITOR_VERSION 1.5.9
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/kapacitor/releases/kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz.asc && \
1920
wget --no-verbose https://dl.influxdata.com/kapacitor/releases/kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz && \
2021
gpg --batch --verify kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz.asc kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz && \
@@ -23,8 +24,7 @@ RUN set -ex && \
2324
rm -f /usr/src/kapacitor-*/kapacitor.conf && \
2425
chmod +x /usr/src/kapacitor-*/* && \
2526
cp -a /usr/src/kapacitor-*/* /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
COPY kapacitor.conf /etc/kapacitor/kapacitor.conf
3030

‎kapacitor/1.6/Dockerfile‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
55
awk 'f{if(sub(/^#/,"",$0)==0){f=0}};/^# enable bash completion/{f=1};{print;}' /etc/bash.bashrc > /etc/bash.bashrc.new && \
66
mv /etc/bash.bashrc.new /etc/bash.bashrc
77

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

1018
RUN set -eux && \
@@ -16,13 +24,8 @@ RUN set -eux && \
1624
esac && \
1725
wget --no-verbose https://dl.influxdata.com/kapacitor/releases/kapacitor_${KAPACITOR_VERSION}-1_${ARCH}.deb.asc && \
1826
wget --no-verbose https://dl.influxdata.com/kapacitor/releases/kapacitor_${KAPACITOR_VERSION}-1_${ARCH}.deb && \
19-
export GNUPGHOME="$(mktemp -d)" && \
20-
echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
21-
gpg --batch --keyserver hkp://keyserver.ubuntu.com --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
2227
gpg --batch --verify kapacitor_${KAPACITOR_VERSION}-1_${ARCH}.deb.asc kapacitor_${KAPACITOR_VERSION}-1_${ARCH}.deb && \
23-
rm -rf "$GNUPGHOME" && \
2428
dpkg -i kapacitor_${KAPACITOR_VERSION}-1_${ARCH}.deb && \
25-
gpgconf --kill all && \
2629
rm -f kapacitor_${KAPACITOR_VERSION}-1_${ARCH}.deb*
2730

2831
COPY kapacitor.conf /etc/kapacitor/kapacitor.conf

‎kapacitor/1.6/alpine/Dockerfile‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
FROM alpine:3.16
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 KAPACITOR_VERSION 1.6.5
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/kapacitor/releases/kapacitor-${KAPACITOR_VERSION}_linux_amd64.tar.gz.asc && \
1920
wget --no-verbose https://dl.influxdata.com/kapacitor/releases/kapacitor-${KAPACITOR_VERSION}_linux_amd64.tar.gz && \
2021
gpg --batch --verify kapacitor-${KAPACITOR_VERSION}_linux_amd64.tar.gz.asc kapacitor-${KAPACITOR_VERSION}_linux_amd64.tar.gz && \
2122
mkdir -p /usr/src && \
2223
tar -C /usr/src -xzf kapacitor-${KAPACITOR_VERSION}_linux_amd64.tar.gz && \
2324
cp -ar /usr/src/kapacitor-*/* / && \
24-
gpgconf --kill all && \
25-
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
25+
rm -rf *.tar.gz* /usr/src && \
2626
apk del .build-deps
2727
COPY kapacitor.conf /etc/kapacitor/kapacitor.conf
2828
EXPOSE 9092

0 commit comments

Comments
 (0)