Address final DockerHub review on InfluxDB 2.0.4 (#459)

Author: danxmoran

influxdb/2.0/Dockerfile

@@ -33,7 +33,7 @@ RUN set -eux && \
     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 --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}/influx* /usr/local/bin/ && \

influxdb/2.0/alpine/Dockerfile

@@ -14,13 +14,11 @@ RUN addgroup -S -g 1000 influxdb && \
 ENV GOSU_VER 1.12
 RUN set -eux; \
     ARCH="$(apk --print-arch)" && \
-    if [ ${ARCH} = x86_64 ]; then \
-        ARCH=amd64; \
-    elif [ ${ARCH} = aarch64 ]; then \
-        ARCH=arm64; \
-    else \
-        echo "Unsupported architecture: ${ARCH}" && exit 1; \
-    fi && \
+    case "${ARCH}" in \
+        x86_64)  ARCH=amd64;; \
+        aarch64) ARCH=arm64;; \
+        *)       echo "Unsupported architecture: ${ARCH}"; exit 1;; \
+    esac && \
 	wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$ARCH"; \
 	wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$ARCH.asc"; \
 	export GNUPGHOME="$(mktemp -d)"; \

influxdb/2.0/alpine/entrypoint.sh

@@ -57,8 +57,9 @@ function set_config_path () {
 }
 
 function set_data_paths () {
-    export BOLT_PATH="$(influxd print-config --key-name bolt-path "${@}")"
-    export ENGINE_PATH="$(influxd print-config --key-name engine-path "${@}")"
+    BOLT_PATH="$(influxd print-config --key-name bolt-path "${@}")"
+    ENGINE_PATH="$(influxd print-config --key-name engine-path "${@}")"
+    export BOLT_PATH ENGINE_PATH
 }
 
 # Ensure all the data directories needed by influxd exist with the right permissions.
@@ -195,9 +196,10 @@ function setup_influxd () {
 # Get the IDs of the initial user/org/bucket created during setup, and export them into the env.
 # We do this to help with arbitrary user scripts, since many influx CLI commands only take IDs.
 function set_init_resource_ids () {
-    export DOCKER_INFLUXDB_INIT_USER_ID="$(influx user list -n "${DOCKER_INFLUXDB_INIT_USER}" --hide-headers | cut -f 1)"
-    export DOCKER_INFLUXDB_INIT_ORG_ID="$(influx org list -n "${DOCKER_INFLUXDB_INIT_ORG}" --hide-headers | cut -f 1)"
-    export DOCKER_INFLUXDB_INIT_BUCKET_ID="$(influx bucket list -n "${DOCKER_INFLUXDB_INIT_BUCKET}" --hide-headers | cut -f 1)"
+    DOCKER_INFLUXDB_INIT_USER_ID="$(influx user list -n "${DOCKER_INFLUXDB_INIT_USER}" --hide-headers | cut -f 1)"
+    DOCKER_INFLUXDB_INIT_ORG_ID="$(influx org list -n "${DOCKER_INFLUXDB_INIT_ORG}" --hide-headers | cut -f 1)"
+    DOCKER_INFLUXDB_INIT_BUCKET_ID="$(influx bucket list -n "${DOCKER_INFLUXDB_INIT_BUCKET}" --hide-headers | cut -f 1)"
+    export DOCKER_INFLUXDB_INIT_USER_ID DOCKER_INFLUXDB_INIT_ORG_ID DOCKER_INFLUXDB_INIT_BUCKET_ID
 }
 
 # Allow users to mount arbitrary startup scripts into the container,

influxdb/2.0/entrypoint.sh

@@ -57,8 +57,9 @@ function set_config_path () {
 }
 
 function set_data_paths () {
-    export BOLT_PATH="$(influxd print-config --key-name bolt-path "${@}")"
-    export ENGINE_PATH="$(influxd print-config --key-name engine-path "${@}")"
+    BOLT_PATH="$(influxd print-config --key-name bolt-path "${@}")"
+    ENGINE_PATH="$(influxd print-config --key-name engine-path "${@}")"
+    export BOLT_PATH ENGINE_PATH
 }
 
 # Ensure all the data directories needed by influxd exist with the right permissions.
@@ -195,9 +196,10 @@ function setup_influxd () {
 # Get the IDs of the initial user/org/bucket created during setup, and export them into the env.
 # We do this to help with arbitrary user scripts, since many influx CLI commands only take IDs.
 function set_init_resource_ids () {
-    export DOCKER_INFLUXDB_INIT_USER_ID="$(influx user list -n "${DOCKER_INFLUXDB_INIT_USER}" --hide-headers | cut -f 1)"
-    export DOCKER_INFLUXDB_INIT_ORG_ID="$(influx org list -n "${DOCKER_INFLUXDB_INIT_ORG}" --hide-headers | cut -f 1)"
-    export DOCKER_INFLUXDB_INIT_BUCKET_ID="$(influx bucket list -n "${DOCKER_INFLUXDB_INIT_BUCKET}" --hide-headers | cut -f 1)"
+    DOCKER_INFLUXDB_INIT_USER_ID="$(influx user list -n "${DOCKER_INFLUXDB_INIT_USER}" --hide-headers | cut -f 1)"
+    DOCKER_INFLUXDB_INIT_ORG_ID="$(influx org list -n "${DOCKER_INFLUXDB_INIT_ORG}" --hide-headers | cut -f 1)"
+    DOCKER_INFLUXDB_INIT_BUCKET_ID="$(influx bucket list -n "${DOCKER_INFLUXDB_INIT_BUCKET}" --hide-headers | cut -f 1)"
+    export DOCKER_INFLUXDB_INIT_USER_ID DOCKER_INFLUXDB_INIT_ORG_ID DOCKER_INFLUXDB_INIT_BUCKET_ID
 }
 
 # Allow users to mount arbitrary startup scripts into the container,