Skip to content

Commit 4bb98c4

Browse files
committed
fix: add more "gpgconf --kill all" commands
1 parent 2e420d9 commit 4bb98c4

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

influxdb/2.0/Dockerfile

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ RUN groupadd -r influxdb --gid=1000 && \
99
# https://github.com/tianon/gosu/releases
1010
ENV GOSU_VER 1.12
1111
RUN set -eux; \
12-
dpkgArch="$(dpkg --print-architecture)" && \
13-
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch" && \
14-
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 && \
17-
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 && \
20-
chmod +x /usr/local/bin/gosu && \
21-
gosu --version && \
22-
gosu nobody true
12+
dpkgArch="$(dpkg --print-architecture)" && \
13+
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch" && \
14+
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 && \
17+
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 && \
20+
chmod +x /usr/local/bin/gosu && \
21+
gosu --version && \
22+
gosu nobody true
2323

2424
ENV INFLUXDB_VERSION 2.0.9
2525
RUN set -eux && \
@@ -35,6 +35,7 @@ RUN set -eux && \
3535
echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
3636
gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
3737
gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
38+
gpgconf --kill all && \
3839
tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
3940
cp influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}/influx* /usr/local/bin/ && \
4041
rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \

influxdb/2.0/alpine/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ RUN set -eux && \
2525
echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
2626
gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
2727
gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
28+
gpgconf --kill all && \
2829
tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
2930
cp influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}/influx* /usr/local/bin/ && \
3031
rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \

0 commit comments

Comments
 (0)