@@ -5,18 +5,20 @@ 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+
814# Install gosu for easy step-down from root.
915# https://github.com/tianon/gosu/releases
1016ENV GOSU_VER 1.12
1117RUN set -eux; \
1218 dpkgArch="$(dpkg --print-architecture)" && \
1319 wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch" && \
1420 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 && \
1721 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 && \
2022 chmod +x /usr/local/bin/gosu && \
2123 gosu --version && \
2224 gosu nobody true
@@ -32,14 +34,9 @@ RUN set -eux && \
3234 esac && \
3335 wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \
3436 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 && \
3837 gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
3938 tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
4039 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}* && \
4340 influxd version
4441
4542# Install the influx CLI
@@ -53,16 +50,19 @@ RUN set -eux && \
5350 esac && \
5451 wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc && \
5552 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 && \
5953 gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
6054 tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
6155 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}* && \
6456 influx version
6557
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.
6767RUN mkdir /docker-entrypoint-initdb.d && \
6868 mkdir -p /var/lib/influxdb2 && \
0 commit comments