Address DockerHub review (#454)

* Replace another `arch` with `apk --print-arch`
* Don't `gosu` to influxdb user for non-influxd commands.
* Use consistent test syntax.

Author: danxmoran

influxdb/2.0/alpine/Dockerfile

@@ -34,7 +34,7 @@ RUN set -eux; \
 
 ENV INFLUXDB_VERSION 2.0.4
 RUN set -eux && \
-    ARCH=$(arch) && \
+    ARCH="$(apk --print-arch)" && \
     if [ ${ARCH} = x86_64 ]; then \
         ARCH=amd64; \
     elif [ ${ARCH} = aarch64 ]; then \

influxdb/2.0/alpine/entrypoint.sh

@@ -283,7 +283,7 @@ function init_influxd () {
 
 # Run influxd, with optional setup logic.
 function influxd_main () {
-    if test -f "${BOLT_PATH}"; then
+    if [ -f "${BOLT_PATH}" ]; then
         log info "found existing boltdb file, skipping setup wrapper" bolt_path "${BOLT_PATH}"
     elif [ -z "${INFLUXDB_INIT_MODE}" ]; then
         log warn "boltdb not found at configured path, but INFLUXDB_INIT_MODE not specified, skipping setup wrapper" bolt_path "${bolt_path}"
@@ -308,29 +308,27 @@ function main () {
         shift 1
     fi
 
-    if ${run_influxd}; then
-        if [ "$1" = run ]; then
-            shift 1
-        fi
+    if ! ${run_influxd}; then
+      exec "${@}"
+    fi
 
-        # Configure logging for our wrapper.
-        set_global_log_level "${@}"
-        # Configure data paths used across functions.
-        set_data_paths "${@}"
-        # Ensure volume directories exist w/ correct permissions.
-        create_directories
+    if [ "$1" = run ]; then
+        shift 1
     fi
 
+    # Configure logging for our wrapper.
+    set_global_log_level "${@}"
+    # Configure data paths used across functions.
+    set_data_paths "${@}"
+    # Ensure volume directories exist w/ correct permissions.
+    create_directories
+
     if [ "$(id -u)" = 0 ]; then
         exec gosu influxdb "$0" "${@}"
         return
     fi
 
-    if ${run_influxd}; then
-        influxd_main "${@}"
-    else
-        exec "${@}"
-    fi
+    influxd_main "${@}"
 }
 
 main "${@}"

influxdb/2.0/entrypoint.sh

@@ -274,7 +274,7 @@ function init_influxd () {
 
 # Run influxd, with optional setup logic.
 function influxd_main () {
-    if test -f "${BOLT_PATH}"; then
+    if [ -f "${BOLT_PATH}" ]; then
         log info "found existing boltdb file, skipping setup wrapper" bolt_path "${BOLT_PATH}"
     elif [ -z "${INFLUXDB_INIT_MODE}" ]; then
         log warn "boltdb not found at configured path, but INFLUXDB_INIT_MODE not specified, skipping setup wrapper" bolt_path "${bolt_path}"
@@ -299,29 +299,27 @@ function main () {
         shift 1
     fi
 
-    if ${run_influxd}; then
-        if [ "$1" = run ]; then
-            shift 1
-        fi
+    if ! ${run_influxd}; then
+      exec "${@}"
+    fi
 
-        # Configure logging for our wrapper.
-        set_global_log_level "${@}"
-        # Configure data paths used across functions.
-        set_data_paths "${@}"
-        # Ensure volume directories exist w/ correct permissions.
-        create_directories
+    if [ "$1" = run ]; then
+        shift 1
     fi
 
+    # Configure logging for our wrapper.
+    set_global_log_level "${@}"
+    # Configure data paths used across functions.
+    set_data_paths "${@}"
+    # Ensure volume directories exist w/ correct permissions.
+    create_directories
+
     if [ "$(id -u)" = 0 ]; then
         exec gosu influxdb "$BASH_SOURCE" "${@}"
         return
     fi
 
-    if ${run_influxd}; then
-        influxd_main "${@}"
-    else
-        exec "${@}"
-    fi
+    influxd_main "${@}"
 }
 
 main "${@}"