Skip to content

Commit 3166e32

Browse files
bnpfeifebnpfeife
committed
Revert "fix: resolve gnupg dirmngr issues"
This reverts commit 7047631.
1 parent a8e0074 commit 3166e32

File tree

10 files changed

+111
-136
lines changed

10 files changed

+111
-136
lines changed

‎influxdb/2.0/Dockerfile

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,18 @@ RUN groupadd -r influxdb --gid=1000 && \
55
mkdir -p /home/influxdb && \
66
chown -R influxdb:influxdb /home/influxdb
77

8-
# Configure GNUPG
9-
RUN mkdir -p /root/.gnupg && chmod 700 /root/.gnupg && \
10-
echo "disable-ipv6" >> /root/.gnupg/dirmngr.conf && \
11-
gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
12-
gpg --batch --keyserver keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4
13-
148
# Install gosu for easy step-down from root.
159
# https://github.com/tianon/gosu/releases
1610
ENV GOSU_VER 1.12
1711
RUN set -eux; \
1812
dpkgArch="$(dpkg --print-architecture)" && \
1913
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch" && \
2014
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch.asc" && \
15+
export GNUPGHOME="$(mktemp -d)" && \
16+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \
2117
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \
18+
gpgconf --kill all && \
19+
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc && \
2220
chmod +x /usr/local/bin/gosu && \
2321
gosu --version && \
2422
gosu nobody true
@@ -33,20 +31,17 @@ RUN set -eux && \
3331
esac && \
3432
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \
3533
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
34+
export GNUPGHOME="$(mktemp -d)" && \
35+
echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
36+
gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
3637
gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
38+
gpgconf --kill all && \
3739
tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
3840
cp influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}/influx* /usr/local/bin/ && \
41+
rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \
3942
influxd version && \
4043
influx version
4144

42-
# Remove GNUPG Configuration
43-
RUN gpgconf --kill all && \
44-
rm -rf \
45-
"/root/.gnupg" \
46-
influxdb2.key \
47-
influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* \
48-
influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}*
49-
5045
# Create standard directories expected by the entry-point.
5146
RUN mkdir /docker-entrypoint-initdb.d && \
5247
mkdir -p /var/lib/influxdb2 && \

‎influxdb/2.0/alpine/Dockerfile

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@ RUN addgroup -S -g 1000 influxdb && \
99
mkdir -p /home/influxdb && \
1010
chown -R influxdb:influxdb /home/influxdb
1111

12-
# Configure GNUPG
13-
RUN mkdir -p /root/.gnupg && chmod 700 /root/.gnupg && \
14-
echo "disable-ipv6" >> /root/.gnupg/dirmngr.conf && \
15-
gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A
16-
1712
ENV INFLUXDB_VERSION 2.0.9
1813
RUN set -eux && \
1914
ARCH="$(apk --print-arch)" && \
@@ -26,20 +21,17 @@ RUN set -eux && \
2621
fi && \
2722
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \
2823
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
24+
export GNUPGHOME="$(mktemp -d)" && \
25+
echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
26+
gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
2927
gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
28+
gpgconf --kill all && \
3029
tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
3130
cp influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}/influx* /usr/local/bin/ && \
31+
rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \
3232
influxd version && \
3333
influx version
3434

35-
# Remove GNUPG Configuration
36-
RUN gpgconf --kill all && \
37-
rm -rf \
38-
"/root/.gnupg" \
39-
influxdb2.key \
40-
influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* \
41-
influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}*
42-
4335
# Create standard directories expected by the entry-point.
4436
RUN mkdir /docker-entrypoint-initdb.d && \
4537
mkdir -p /var/lib/influxdb2 && \

‎influxdb/2.1/Dockerfile

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,18 @@ RUN groupadd -r influxdb --gid=1000 && \
55
mkdir -p /home/influxdb && \
66
chown -R influxdb:influxdb /home/influxdb
77

8-
# Configure GNUPG
9-
RUN mkdir -p /root/.gnupg && chmod 700 /root/.gnupg && \
10-
echo "disable-ipv6" >> /root/.gnupg/dirmngr.conf && \
11-
gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
12-
gpg --batch --keyserver keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4
13-
148
# Install gosu for easy step-down from root.
159
# https://github.com/tianon/gosu/releases
1610
ENV GOSU_VER 1.12
1711
RUN set -eux; \
1812
dpkgArch="$(dpkg --print-architecture)" && \
1913
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch" && \
2014
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch.asc" && \
15+
export GNUPGHOME="$(mktemp -d)" && \
16+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \
2117
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \
18+
gpgconf --kill all && \
19+
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc && \
2220
chmod +x /usr/local/bin/gosu && \
2321
gosu --version && \
2422
gosu nobody true
@@ -34,9 +32,14 @@ RUN set -eux && \
3432
esac && \
3533
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \
3634
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
35+
export GNUPGHOME="$(mktemp -d)" && \
36+
echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
37+
gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
3738
gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
3839
tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
3940
cp influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}/influxd /usr/local/bin/influxd && \
41+
gpgconf --kill all && \
42+
rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \
4043
influxd version
4144

4245
# Install the influx CLI
@@ -50,19 +53,16 @@ RUN set -eux && \
5053
esac && \
5154
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc && \
5255
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
56+
export GNUPGHOME="$(mktemp -d)" && \
57+
echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
58+
gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
5359
gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
5460
tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
5561
cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \
62+
gpgconf --kill all && \
63+
rm -rf "$GNUPGHOME" influxdb2.key influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \
5664
influx version
5765

58-
# Remove GNUPG Configuration
59-
RUN gpgconf --kill all && \
60-
rm -rf \
61-
"/root/.gnupg" \
62-
influxdb2.key \
63-
influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* \
64-
influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}*
65-
6666
# Create standard directories expected by the entry-point.
6767
RUN mkdir /docker-entrypoint-initdb.d && \
6868
mkdir -p /var/lib/influxdb2 && \

‎influxdb/2.1/alpine/Dockerfile

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,7 @@ RUN addgroup -S -g 1000 influxdb && \
99
mkdir -p /home/influxdb && \
1010
chown -R influxdb:influxdb /home/influxdb
1111

12-
# Configure GNUPG
13-
RUN mkdir -p /root/.gnupg && chmod 700 /root/.gnupg && \
14-
echo "disable-ipv6" >> /root/.gnupg/dirmngr.conf && \
15-
gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A
16-
17-
# Install the influxd server
12+
# Install the infuxd server
1813
ENV INFLUXDB_VERSION 2.1.1
1914
RUN set -eux && \
2015
ARCH="$(apk --print-arch)" && \
@@ -27,9 +22,14 @@ RUN set -eux && \
2722
fi && \
2823
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \
2924
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
25+
export GNUPGHOME="$(mktemp -d)" && \
26+
echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
27+
gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
3028
gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
3129
tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
3230
cp influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}/influxd /usr/local/bin/influxd && \
31+
gpgconf --kill all && \
32+
rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \
3333
influxd version
3434

3535
# Install the influx CLI
@@ -45,19 +45,16 @@ RUN set -eux && \
4545
fi && \
4646
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc && \
4747
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
48+
export GNUPGHOME="$(mktemp -d)" && \
49+
echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
50+
gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
4851
gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
4952
tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
5053
cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \
54+
gpgconf --kill all && \
55+
rm -rf "$GNUPGHOME" influxdb2.key influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \
5156
influx version
5257

53-
# Remove GNUPG Configuration
54-
RUN gpgconf --kill all && \
55-
rm -rf \
56-
"/root/.gnupg" \
57-
influxdb2.key \
58-
influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* \
59-
influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}*
60-
6158
# Create standard directories expected by the entry-point.
6259
RUN mkdir /docker-entrypoint-initdb.d && \
6360
mkdir -p /var/lib/influxdb2 && \

‎influxdb/2.2/Dockerfile

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,18 @@ RUN groupadd -r influxdb --gid=1000 && \
55
mkdir -p /home/influxdb && \
66
chown -R influxdb:influxdb /home/influxdb
77

8-
# Configure GNUPG
9-
RUN mkdir -p /root/.gnupg && chmod 700 /root/.gnupg && \
10-
echo "disable-ipv6" >> /root/.gnupg/dirmngr.conf && \
11-
gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
12-
gpg --batch --keyserver keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4
13-
148
# Install gosu for easy step-down from root.
159
# https://github.com/tianon/gosu/releases
1610
ENV GOSU_VER 1.12
1711
RUN set -eux; \
1812
dpkgArch="$(dpkg --print-architecture)" && \
1913
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch" && \
2014
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch.asc" && \
15+
export GNUPGHOME="$(mktemp -d)" && \
16+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \
2117
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \
18+
gpgconf --kill all && \
19+
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc && \
2220
chmod +x /usr/local/bin/gosu && \
2321
gosu --version && \
2422
gosu nobody true
@@ -34,9 +32,14 @@ RUN set -eux && \
3432
esac && \
3533
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \
3634
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
35+
export GNUPGHOME="$(mktemp -d)" && \
36+
echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
37+
gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
3738
gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
3839
tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
3940
cp influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}/influxd /usr/local/bin/influxd && \
41+
gpgconf --kill all && \
42+
rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \
4043
influxd version
4144

4245
# Install the influx CLI
@@ -50,19 +53,16 @@ RUN set -eux && \
5053
esac && \
5154
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc && \
5255
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
56+
export GNUPGHOME="$(mktemp -d)" && \
57+
echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
58+
gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
5359
gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
5460
tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
5561
cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \
62+
gpgconf --kill all && \
63+
rm -rf "$GNUPGHOME" influxdb2.key influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \
5664
influx version
5765

58-
# Remove GNUPG Configuration
59-
RUN gpgconf --kill all && \
60-
rm -rf \
61-
"/root/.gnupg" \
62-
influxdb2.key \
63-
influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* \
64-
influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}*
65-
6666
# Create standard directories expected by the entry-point.
6767
RUN mkdir /docker-entrypoint-initdb.d && \
6868
mkdir -p /var/lib/influxdb2 && \

‎influxdb/2.2/alpine/Dockerfile

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@ RUN addgroup -S -g 1000 influxdb && \
99
mkdir -p /home/influxdb && \
1010
chown -R influxdb:influxdb /home/influxdb
1111

12-
# Configure GNUPG
13-
RUN mkdir -p /root/.gnupg && chmod 700 /root/.gnupg && \
14-
echo "disable-ipv6" >> /root/.gnupg/dirmngr.conf && \
15-
gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A
16-
1712
# Install the infuxd server
1813
ENV INFLUXDB_VERSION 2.2.0
1914
RUN set -eux && \
@@ -27,9 +22,14 @@ RUN set -eux && \
2722
fi && \
2823
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \
2924
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
25+
export GNUPGHOME="$(mktemp -d)" && \
26+
echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
27+
gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
3028
gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
3129
tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
3230
cp influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}/influxd /usr/local/bin/influxd && \
31+
gpgconf --kill all && \
32+
rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \
3333
influxd version
3434

3535
# Install the influx CLI
@@ -45,19 +45,16 @@ RUN set -eux && \
4545
fi && \
4646
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc && \
4747
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
48+
export GNUPGHOME="$(mktemp -d)" && \
49+
echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
50+
gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
4851
gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
4952
tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
5053
cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \
54+
gpgconf --kill all && \
55+
rm -rf "$GNUPGHOME" influxdb2.key influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \
5156
influx version
5257

53-
# Remove GNUPG Configuration
54-
RUN gpgconf --kill all && \
55-
rm -rf \
56-
"/root/.gnupg" \
57-
influxdb2.key \
58-
influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* \
59-
influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}*
60-
6158
# Create standard directories expected by the entry-point.
6259
RUN mkdir /docker-entrypoint-initdb.d && \
6360
mkdir -p /var/lib/influxdb2 && \

0 commit comments

Comments
 (0)