fix: automatic upgrade works with 1.x containers (#557)

Author: williamhbaker

influxdb/2.1/alpine/entrypoint.sh

@@ -331,19 +331,6 @@ function init_influxd () {
     sed -i "s#http://localhost:${INFLUXD_INIT_PORT}#${final_host_scheme}://localhost:${final_port}#g" "${INFLUX_CONFIGS_PATH}"
 }
 
-# Run influxd, with optional setup logic.
-function influxd_main () {
-    if [ -f "${BOLT_PATH}" ]; then
-        log info "found existing boltdb file, skipping setup wrapper" bolt_path "${BOLT_PATH}"
-    elif [ -z "${DOCKER_INFLUXDB_INIT_MODE}" ]; then
-        log warn "boltdb not found at configured path, but DOCKER_INFLUXDB_INIT_MODE not specified, skipping setup wrapper" bolt_path "${bolt_path}"
-    else
-        init_influxd "${@}"
-    fi
-
-    exec influxd "${@}"
-}
-
 # Check if the --help or -h flag is set in a list of CLI args.
 function check_help_flag () {
   for arg in "${@}"; do
@@ -386,12 +373,25 @@ function main () {
         create_directories
     fi
 
+    if [ -f "${BOLT_PATH}" ]; then
+        log info "found existing boltdb file, skipping setup wrapper" bolt_path "${BOLT_PATH}"
+    elif [ -z "${DOCKER_INFLUXDB_INIT_MODE}" ]; then
+        log warn "boltdb not found at configured path, but DOCKER_INFLUXDB_INIT_MODE not specified, skipping setup wrapper" bolt_path "${bolt_path}"
+    else
+        init_influxd "${@}"
+        # Set correct permission on volume directories again. This is necessary so that if the container was run as the
+        # root user, the files from the automatic upgrade/initialization will be correctly set when stepping down to the
+        # influxdb user.
+        create_directories
+    fi
+
     if [ "$(id -u)" = 0 ]; then
         exec gosu influxdb "$BASH_SOURCE" "${@}"
         return
     fi
 
-    influxd_main "${@}"
+    # Run influxd.
+    exec influxd "${@}"
 }
 
 main "${@}"

influxdb/2.1/entrypoint.sh

@@ -331,19 +331,6 @@ function init_influxd () {
     sed -i "s#http://localhost:${INFLUXD_INIT_PORT}#${final_host_scheme}://localhost:${final_port}#g" "${INFLUX_CONFIGS_PATH}"
 }
 
-# Run influxd, with optional setup logic.
-function influxd_main () {
-    if [ -f "${BOLT_PATH}" ]; then
-        log info "found existing boltdb file, skipping setup wrapper" bolt_path "${BOLT_PATH}"
-    elif [ -z "${DOCKER_INFLUXDB_INIT_MODE}" ]; then
-        log warn "boltdb not found at configured path, but DOCKER_INFLUXDB_INIT_MODE not specified, skipping setup wrapper" bolt_path "${bolt_path}"
-    else
-        init_influxd "${@}"
-    fi
-
-    exec influxd "${@}"
-}
-
 # Check if the --help or -h flag is set in a list of CLI args.
 function check_help_flag () {
   for arg in "${@}"; do
@@ -376,7 +363,6 @@ function main () {
         shift 1
     fi
 
-
     if ! check_help_flag "${@}"; then
         # Configure logging for our wrapper.
         set_global_log_level "${@}"
@@ -386,12 +372,25 @@ function main () {
         create_directories
     fi
 
+    if [ -f "${BOLT_PATH}" ]; then
+        log info "found existing boltdb file, skipping setup wrapper" bolt_path "${BOLT_PATH}"
+    elif [ -z "${DOCKER_INFLUXDB_INIT_MODE}" ]; then
+        log warn "boltdb not found at configured path, but DOCKER_INFLUXDB_INIT_MODE not specified, skipping setup wrapper" bolt_path "${bolt_path}"
+    else
+        init_influxd "${@}"
+        # Set correct permission on volume directories again. This is necessary so that if the container was run as the
+        # root user, the files from the automatic upgrade/initialization will be correctly set when stepping down to the
+        # influxdb user.
+        create_directories
+    fi
+
     if [ "$(id -u)" = 0 ]; then
         exec gosu influxdb "$BASH_SOURCE" "${@}"
         return
     fi
 
-    influxd_main "${@}"
+    # Run influxd.
+    exec influxd "${@}"
 }
 
 main "${@}"