From 3166e32c3f69544ad5bd4393d429db260e31668d Mon Sep 17 00:00:00 2001
From: Brandon Pfeifer <bpfeifer@influxdata.com>
Date: Mon, 22 Aug 2022 00:15:40 -0400
Subject: [PATCH] Revert "fix: resolve gnupg dirmngr issues"
This reverts commit 7047631c6331631cd38d70f8ab41b371312b7890.
---
influxdb/2.0/Dockerfile | 23 +++++++++--------------
influxdb/2.0/alpine/Dockerfile | 18 +++++-------------
influxdb/2.1/Dockerfile | 28 ++++++++++++++--------------
influxdb/2.1/alpine/Dockerfile | 25 +++++++++++--------------
influxdb/2.2/Dockerfile | 28 ++++++++++++++--------------
influxdb/2.2/alpine/Dockerfile | 23 ++++++++++-------------
influxdb/2.3/Dockerfile | 28 ++++++++++++++--------------
influxdb/2.3/alpine/Dockerfile | 23 ++++++++++-------------
influxdb/2.4/Dockerfile | 28 ++++++++++++++--------------
influxdb/2.4/alpine/Dockerfile | 23 ++++++++++-------------
10 files changed, 111 insertions(+), 136 deletions(-)
diff --git a/influxdb/2.0/Dockerfile b/influxdb/2.0/Dockerfile
index 56ca456..9f0d75b 100644
--- a/influxdb/2.0/Dockerfile
+++ b/influxdb/2.0/Dockerfile
@@ -5,12 +5,6 @@ RUN groupadd -r influxdb --gid=1000 && \
mkdir -p /home/influxdb && \
chown -R influxdb:influxdb /home/influxdb
-# Configure GNUPG
-RUN mkdir -p /root/.gnupg && chmod 700 /root/.gnupg && \
- echo "disable-ipv6" >> /root/.gnupg/dirmngr.conf && \
- gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
- gpg --batch --keyserver keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4
-
# Install gosu for easy step-down from root.
# https://github.com/tianon/gosu/releases
ENV GOSU_VER 1.12
@@ -18,7 +12,11 @@ RUN set -eux; \
dpkgArch="$(dpkg --print-architecture)" && \
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch" && \
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch.asc" && \
+ export GNUPGHOME="$(mktemp -d)" && \
+ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \
+ gpgconf --kill all && \
+ rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc && \
chmod +x /usr/local/bin/gosu && \
gosu --version && \
gosu nobody true
@@ -33,20 +31,17 @@ RUN set -eux && \
esac && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
+ export GNUPGHOME="$(mktemp -d)" && \
+ echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
+ gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
+ gpgconf --kill all && \
tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
cp influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}/influx* /usr/local/bin/ && \
+ rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \
influxd version && \
influx version
-# Remove GNUPG Configuration
-RUN gpgconf --kill all && \
- rm -rf \
- "/root/.gnupg" \
- influxdb2.key \
- influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* \
- influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}*
-
# Create standard directories expected by the entry-point.
RUN mkdir /docker-entrypoint-initdb.d && \
mkdir -p /var/lib/influxdb2 && \
diff --git a/influxdb/2.0/alpine/Dockerfile b/influxdb/2.0/alpine/Dockerfile
index 49172b0..49efc31 100644
--- a/influxdb/2.0/alpine/Dockerfile
+++ b/influxdb/2.0/alpine/Dockerfile
@@ -9,11 +9,6 @@ RUN addgroup -S -g 1000 influxdb && \
mkdir -p /home/influxdb && \
chown -R influxdb:influxdb /home/influxdb
-# Configure GNUPG
-RUN mkdir -p /root/.gnupg && chmod 700 /root/.gnupg && \
- echo "disable-ipv6" >> /root/.gnupg/dirmngr.conf && \
- gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A
-
ENV INFLUXDB_VERSION 2.0.9
RUN set -eux && \
ARCH="$(apk --print-arch)" && \
@@ -26,20 +21,17 @@ RUN set -eux && \
fi && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
+ export GNUPGHOME="$(mktemp -d)" && \
+ echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
+ gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
+ gpgconf --kill all && \
tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
cp influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}/influx* /usr/local/bin/ && \
+ rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \
influxd version && \
influx version
-# Remove GNUPG Configuration
-RUN gpgconf --kill all && \
- rm -rf \
- "/root/.gnupg" \
- influxdb2.key \
- influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* \
- influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}*
-
# Create standard directories expected by the entry-point.
RUN mkdir /docker-entrypoint-initdb.d && \
mkdir -p /var/lib/influxdb2 && \
diff --git a/influxdb/2.1/Dockerfile b/influxdb/2.1/Dockerfile
index ce7d1f6..c38feff 100644
--- a/influxdb/2.1/Dockerfile
+++ b/influxdb/2.1/Dockerfile
@@ -5,12 +5,6 @@ RUN groupadd -r influxdb --gid=1000 && \
mkdir -p /home/influxdb && \
chown -R influxdb:influxdb /home/influxdb
-# Configure GNUPG
-RUN mkdir -p /root/.gnupg && chmod 700 /root/.gnupg && \
- echo "disable-ipv6" >> /root/.gnupg/dirmngr.conf && \
- gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
- gpg --batch --keyserver keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4
-
# Install gosu for easy step-down from root.
# https://github.com/tianon/gosu/releases
ENV GOSU_VER 1.12
@@ -18,7 +12,11 @@ RUN set -eux; \
dpkgArch="$(dpkg --print-architecture)" && \
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch" && \
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch.asc" && \
+ export GNUPGHOME="$(mktemp -d)" && \
+ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \
+ gpgconf --kill all && \
+ rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc && \
chmod +x /usr/local/bin/gosu && \
gosu --version && \
gosu nobody true
@@ -34,9 +32,14 @@ RUN set -eux && \
esac && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
+ export GNUPGHOME="$(mktemp -d)" && \
+ echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
+ gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
cp influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}/influxd /usr/local/bin/influxd && \
+ gpgconf --kill all && \
+ rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \
influxd version
# Install the influx CLI
@@ -50,19 +53,16 @@ RUN set -eux && \
esac && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
+ export GNUPGHOME="$(mktemp -d)" && \
+ echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
+ gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \
+ gpgconf --kill all && \
+ rm -rf "$GNUPGHOME" influxdb2.key influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \
influx version
-# Remove GNUPG Configuration
-RUN gpgconf --kill all && \
- rm -rf \
- "/root/.gnupg" \
- influxdb2.key \
- influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* \
- influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}*
-
# Create standard directories expected by the entry-point.
RUN mkdir /docker-entrypoint-initdb.d && \
mkdir -p /var/lib/influxdb2 && \
diff --git a/influxdb/2.1/alpine/Dockerfile b/influxdb/2.1/alpine/Dockerfile
index be0e2bb..260a8fb 100644
--- a/influxdb/2.1/alpine/Dockerfile
+++ b/influxdb/2.1/alpine/Dockerfile
@@ -9,12 +9,7 @@ RUN addgroup -S -g 1000 influxdb && \
mkdir -p /home/influxdb && \
chown -R influxdb:influxdb /home/influxdb
-# Configure GNUPG
-RUN mkdir -p /root/.gnupg && chmod 700 /root/.gnupg && \
- echo "disable-ipv6" >> /root/.gnupg/dirmngr.conf && \
- gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A
-
-# Install the influxd server
+# Install the infuxd server
ENV INFLUXDB_VERSION 2.1.1
RUN set -eux && \
ARCH="$(apk --print-arch)" && \
@@ -27,9 +22,14 @@ RUN set -eux && \
fi && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
+ export GNUPGHOME="$(mktemp -d)" && \
+ echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
+ gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
cp influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}/influxd /usr/local/bin/influxd && \
+ gpgconf --kill all && \
+ rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \
influxd version
# Install the influx CLI
@@ -45,19 +45,16 @@ RUN set -eux && \
fi && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
+ export GNUPGHOME="$(mktemp -d)" && \
+ echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
+ gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \
+ gpgconf --kill all && \
+ rm -rf "$GNUPGHOME" influxdb2.key influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \
influx version
-# Remove GNUPG Configuration
-RUN gpgconf --kill all && \
- rm -rf \
- "/root/.gnupg" \
- influxdb2.key \
- influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* \
- influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}*
-
# Create standard directories expected by the entry-point.
RUN mkdir /docker-entrypoint-initdb.d && \
mkdir -p /var/lib/influxdb2 && \
diff --git a/influxdb/2.2/Dockerfile b/influxdb/2.2/Dockerfile
index 977b21b..ece8710 100644
--- a/influxdb/2.2/Dockerfile
+++ b/influxdb/2.2/Dockerfile
@@ -5,12 +5,6 @@ RUN groupadd -r influxdb --gid=1000 && \
mkdir -p /home/influxdb && \
chown -R influxdb:influxdb /home/influxdb
-# Configure GNUPG
-RUN mkdir -p /root/.gnupg && chmod 700 /root/.gnupg && \
- echo "disable-ipv6" >> /root/.gnupg/dirmngr.conf && \
- gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
- gpg --batch --keyserver keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4
-
# Install gosu for easy step-down from root.
# https://github.com/tianon/gosu/releases
ENV GOSU_VER 1.12
@@ -18,7 +12,11 @@ RUN set -eux; \
dpkgArch="$(dpkg --print-architecture)" && \
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch" && \
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch.asc" && \
+ export GNUPGHOME="$(mktemp -d)" && \
+ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \
+ gpgconf --kill all && \
+ rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc && \
chmod +x /usr/local/bin/gosu && \
gosu --version && \
gosu nobody true
@@ -34,9 +32,14 @@ RUN set -eux && \
esac && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
+ export GNUPGHOME="$(mktemp -d)" && \
+ echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
+ gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
cp influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}/influxd /usr/local/bin/influxd && \
+ gpgconf --kill all && \
+ rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \
influxd version
# Install the influx CLI
@@ -50,19 +53,16 @@ RUN set -eux && \
esac && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
+ export GNUPGHOME="$(mktemp -d)" && \
+ echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
+ gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \
+ gpgconf --kill all && \
+ rm -rf "$GNUPGHOME" influxdb2.key influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \
influx version
-# Remove GNUPG Configuration
-RUN gpgconf --kill all && \
- rm -rf \
- "/root/.gnupg" \
- influxdb2.key \
- influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* \
- influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}*
-
# Create standard directories expected by the entry-point.
RUN mkdir /docker-entrypoint-initdb.d && \
mkdir -p /var/lib/influxdb2 && \
diff --git a/influxdb/2.2/alpine/Dockerfile b/influxdb/2.2/alpine/Dockerfile
index 3041c4e..3baff75 100644
--- a/influxdb/2.2/alpine/Dockerfile
+++ b/influxdb/2.2/alpine/Dockerfile
@@ -9,11 +9,6 @@ RUN addgroup -S -g 1000 influxdb && \
mkdir -p /home/influxdb && \
chown -R influxdb:influxdb /home/influxdb
-# Configure GNUPG
-RUN mkdir -p /root/.gnupg && chmod 700 /root/.gnupg && \
- echo "disable-ipv6" >> /root/.gnupg/dirmngr.conf && \
- gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A
-
# Install the infuxd server
ENV INFLUXDB_VERSION 2.2.0
RUN set -eux && \
@@ -27,9 +22,14 @@ RUN set -eux && \
fi && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
+ export GNUPGHOME="$(mktemp -d)" && \
+ echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
+ gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
cp influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}/influxd /usr/local/bin/influxd && \
+ gpgconf --kill all && \
+ rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \
influxd version
# Install the influx CLI
@@ -45,19 +45,16 @@ RUN set -eux && \
fi && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
+ export GNUPGHOME="$(mktemp -d)" && \
+ echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
+ gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \
+ gpgconf --kill all && \
+ rm -rf "$GNUPGHOME" influxdb2.key influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \
influx version
-# Remove GNUPG Configuration
-RUN gpgconf --kill all && \
- rm -rf \
- "/root/.gnupg" \
- influxdb2.key \
- influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* \
- influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}*
-
# Create standard directories expected by the entry-point.
RUN mkdir /docker-entrypoint-initdb.d && \
mkdir -p /var/lib/influxdb2 && \
diff --git a/influxdb/2.3/Dockerfile b/influxdb/2.3/Dockerfile
index f554963..0a3d979 100644
--- a/influxdb/2.3/Dockerfile
+++ b/influxdb/2.3/Dockerfile
@@ -5,12 +5,6 @@ RUN groupadd -r influxdb --gid=1000 && \
mkdir -p /home/influxdb && \
chown -R influxdb:influxdb /home/influxdb
-# Configure GNUPG
-RUN mkdir -p /root/.gnupg && chmod 700 /root/.gnupg && \
- echo "disable-ipv6" >> /root/.gnupg/dirmngr.conf && \
- gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
- gpg --batch --keyserver keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4
-
# Install gosu for easy step-down from root.
# https://github.com/tianon/gosu/releases
ENV GOSU_VER 1.12
@@ -18,7 +12,11 @@ RUN set -eux; \
dpkgArch="$(dpkg --print-architecture)" && \
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch" && \
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch.asc" && \
+ export GNUPGHOME="$(mktemp -d)" && \
+ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \
+ gpgconf --kill all && \
+ rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc && \
chmod +x /usr/local/bin/gosu && \
gosu --version && \
gosu nobody true
@@ -34,9 +32,14 @@ RUN set -eux && \
esac && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
+ export GNUPGHOME="$(mktemp -d)" && \
+ echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
+ gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
cp influxdb2_linux_${ARCH}/influxd /usr/local/bin/influxd && \
+ gpgconf --kill all && \
+ rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \
influxd version
# Install the influx CLI
@@ -50,19 +53,16 @@ RUN set -eux && \
esac && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
+ export GNUPGHOME="$(mktemp -d)" && \
+ echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
+ gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \
+ gpgconf --kill all && \
+ rm -rf "$GNUPGHOME" influxdb2.key influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \
influx version
-# Remove GNUPG Configuration
-RUN gpgconf --kill all && \
- rm -rf \
- "/root/.gnupg" \
- influxdb2.key \
- influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* \
- influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}*
-
# Create standard directories expected by the entry-point.
RUN mkdir /docker-entrypoint-initdb.d && \
mkdir -p /var/lib/influxdb2 && \
diff --git a/influxdb/2.3/alpine/Dockerfile b/influxdb/2.3/alpine/Dockerfile
index d7a1d16..991698d 100644
--- a/influxdb/2.3/alpine/Dockerfile
+++ b/influxdb/2.3/alpine/Dockerfile
@@ -9,11 +9,6 @@ RUN addgroup -S -g 1000 influxdb && \
mkdir -p /home/influxdb && \
chown -R influxdb:influxdb /home/influxdb
-# Configure GNUPG
-RUN mkdir -p /root/.gnupg && chmod 700 /root/.gnupg && \
- echo "disable-ipv6" >> /root/.gnupg/dirmngr.conf && \
- gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A
-
# Install the infuxd server
ENV INFLUXDB_VERSION 2.3.0
RUN set -eux && \
@@ -27,9 +22,14 @@ RUN set -eux && \
fi && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
+ export GNUPGHOME="$(mktemp -d)" && \
+ echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
+ gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
cp influxdb2_linux_${ARCH}/influxd /usr/local/bin/influxd && \
+ gpgconf --kill all && \
+ rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \
influxd version
# Install the influx CLI
@@ -45,19 +45,16 @@ RUN set -eux && \
fi && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
+ export GNUPGHOME="$(mktemp -d)" && \
+ echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
+ gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \
+ gpgconf --kill all && \
+ rm -rf "$GNUPGHOME" influxdb2.key influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \
influx version
-# Remove GNUPG Configuration
-RUN gpgconf --kill all && \
- rm -rf \
- "/root/.gnupg" \
- influxdb2.key \
- influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* \
- influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}*
-
# Create standard directories expected by the entry-point.
RUN mkdir /docker-entrypoint-initdb.d && \
mkdir -p /var/lib/influxdb2 && \
diff --git a/influxdb/2.4/Dockerfile b/influxdb/2.4/Dockerfile
index 055bf33..c996cec 100644
--- a/influxdb/2.4/Dockerfile
+++ b/influxdb/2.4/Dockerfile
@@ -5,12 +5,6 @@ RUN groupadd -r influxdb --gid=1000 && \
mkdir -p /home/influxdb && \
chown -R influxdb:influxdb /home/influxdb
-# Configure GNUPG
-RUN mkdir -p /root/.gnupg && chmod 700 /root/.gnupg && \
- echo "disable-ipv6" >> /root/.gnupg/dirmngr.conf && \
- gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
- gpg --batch --keyserver keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4
-
# Install gosu for easy step-down from root.
# https://github.com/tianon/gosu/releases
ENV GOSU_VER 1.12
@@ -18,7 +12,11 @@ RUN set -eux; \
dpkgArch="$(dpkg --print-architecture)" && \
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch" && \
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch.asc" && \
+ export GNUPGHOME="$(mktemp -d)" && \
+ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \
+ gpgconf --kill all && \
+ rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc && \
chmod +x /usr/local/bin/gosu && \
gosu --version && \
gosu nobody true
@@ -34,9 +32,14 @@ RUN set -eux && \
esac && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
+ export GNUPGHOME="$(mktemp -d)" && \
+ echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
+ gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
cp influxdb2_linux_${ARCH}/influxd /usr/local/bin/influxd && \
+ gpgconf --kill all && \
+ rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \
influxd version
# Install the influx CLI
@@ -50,19 +53,16 @@ RUN set -eux && \
esac && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
+ export GNUPGHOME="$(mktemp -d)" && \
+ echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
+ gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \
+ gpgconf --kill all && \
+ rm -rf "$GNUPGHOME" influxdb2.key influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \
influx version
-# Remove GNUPG Configuration
-RUN gpgconf --kill all && \
- rm -rf \
- "/root/.gnupg" \
- influxdb2.key \
- influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* \
- influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}*
-
# Create standard directories expected by the entry-point.
RUN mkdir /docker-entrypoint-initdb.d && \
mkdir -p /var/lib/influxdb2 && \
diff --git a/influxdb/2.4/alpine/Dockerfile b/influxdb/2.4/alpine/Dockerfile
index d364e07..aade1c5 100644
--- a/influxdb/2.4/alpine/Dockerfile
+++ b/influxdb/2.4/alpine/Dockerfile
@@ -9,11 +9,6 @@ RUN addgroup -S -g 1000 influxdb && \
mkdir -p /home/influxdb && \
chown -R influxdb:influxdb /home/influxdb
-# Configure GNUPG
-RUN mkdir -p /root/.gnupg && chmod 700 /root/.gnupg && \
- echo "disable-ipv6" >> /root/.gnupg/dirmngr.conf && \
- gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A
-
# Install the infuxd server
ENV INFLUXDB_VERSION 2.4.0
RUN set -eux && \
@@ -27,9 +22,14 @@ RUN set -eux && \
fi && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
+ export GNUPGHOME="$(mktemp -d)" && \
+ echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
+ gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
cp influxdb2_linux_${ARCH}/influxd /usr/local/bin/influxd && \
+ gpgconf --kill all && \
+ rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \
influxd version
# Install the influx CLI
@@ -45,19 +45,16 @@ RUN set -eux && \
fi && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc && \
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
+ export GNUPGHOME="$(mktemp -d)" && \
+ echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
+ gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \
+ gpgconf --kill all && \
+ rm -rf "$GNUPGHOME" influxdb2.key influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \
influx version
-# Remove GNUPG Configuration
-RUN gpgconf --kill all && \
- rm -rf \
- "/root/.gnupg" \
- influxdb2.key \
- influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* \
- influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}*
-
# Create standard directories expected by the entry-point.
RUN mkdir /docker-entrypoint-initdb.d && \
mkdir -p /var/lib/influxdb2 && \
--
GitLab