diff --git a/.circleci/config.yml b/.circleci/config.yml
index dc1f74d81564876da9f2608a21939c36a2bdafae..4156db01f516f73eb86a50f499bacccd8fa6b8cf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,7 +18,21 @@ workflows:
version: 2
ci:
jobs:
- - build
+ - build:
+ name: build-chronograf
+ product: chronograf
+ - build:
+ name: build-dockerlib
+ product: dockerlib
+ - build:
+ name: build-influxdb
+ product: influxdb
+ - build:
+ name: build-kapacitor
+ product: kapacitor
+ - build:
+ name: build-telegraf
+ product: telegraf
- test-influxdb:
matrix:
parameters:
@@ -36,12 +50,16 @@ workflows:
jobs:
build:
+ parameters:
+ product:
+ type: string
docker:
- image: cimg/go:1.15.6
steps:
- checkout
- setup_remote_docker
- - run: bash circle-test.sh
+ - run: |
+ ./circle-test.sh "<< parameters.product >>"
test-influxdb:
<<: *ubuntu_machine
diff --git a/influxdb/2.0/Dockerfile b/influxdb/2.0/Dockerfile
index 56ca4560171c3fb078590a132f057516284f891c..9f0d75b2d159ac95b106e9ba3bbe358f8aaf7517 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 49172b05d0f321caad5a68ef4c6631adb62611bc..49efc31891fc6eb63e82acfec2c84dbb140076f7 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 ce7d1f69d72409a534d9bf7628c8588cb6c39b89..c38feff62f726659905ecc10c9c9157194b03925 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 be0e2bbb31cbe0ea74958a3371d94c6e89a6c547..260a8fb6648af80883353fbbc77d639002bcaedc 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 977b21b418b0fe6546e7f0c7565d2ae3e0f64516..ece8710c9ec7050cdc1f373ec24338ef2ce545dd 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 3041c4ec38c3466fa81dd3de34bfecd5806b2fa8..3baff7512554597689cecacd34bbc85e16e43bec 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 da342a159cc2d7773c3a48e03d8d0ef4112b4f27..0a3d97936c29d89a2203672802c1be172deb62e6 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,10 +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 && \
- rm -rf influxdb2-* && \
+ gpgconf --kill all && \
+ rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \
influxd version
# Install the influx CLI
@@ -51,18 +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 && \
- rm -rf influxdb2-* && \
+ 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
-
# 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 9b022c1dc76659e8d4aab83b9af0ae27fd9c584a..991698d72086384765a9ba7267c61151f8ca88b9 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,10 +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 && \
- rm -rf influxdb2-* && \
+ gpgconf --kill all && \
+ rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \
influxd version
# Install the influx CLI
@@ -46,18 +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 && \
- rm -rf influxdb2-* && \
+ 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
-
# 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 dd5d0362dd523a8f1f716fd3f564b60e75ab38c1..c996cec8ee035e3d1b28ed6bc60b4ab0c3493766 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,10 +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 && \
- rm -rf influxdb2-* && \
+ gpgconf --kill all && \
+ rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \
influxd version
# Install the influx CLI
@@ -51,18 +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 && \
- rm -rf influxdb2-* && \
+ 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
-
# 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 91672b76a4685db1368f010f75cafd1b9d2eabf0..aade1c59350f7747b7a15f044f61fa4acaae1c48 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,10 +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 && \
- rm -rf influxdb2-* && \
+ gpgconf --kill all && \
+ rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \
influxd version
# Install the influx CLI
@@ -46,18 +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 && \
- rm -rf influxdb2-* && \
+ 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
-
# Create standard directories expected by the entry-point.
RUN mkdir /docker-entrypoint-initdb.d && \
mkdir -p /var/lib/influxdb2 && \