fix: fix minio restart env not same

Signed-off-by: yang.yu <yang.yu@chaitin.com>
bitnami · Jun 15, 2023 · 33e2551 · 33e2551
1 parent 881607d
commit 33e2551
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 15 deletions.
diff --git a/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/libminio.sh b/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/libminio.sh
@@ -166,6 +166,9 @@ minio_start_bg() {
 
 ########################
 # Stop MinIO
+# Globals:
+#   MINIO_DISTRIBUTED_MODE_ENABLED
+#   MINIO_PID_FILE
 # Arguments:
 #   None
 # Returns:
@@ -174,7 +177,17 @@ minio_start_bg() {
 minio_stop() {
     if is_minio_running; then
         info "Stopping MinIO..."
-        minio_client_execute_timeout admin service stop local >/dev/null 2>&1 || true
+
+        if is_boolean_yes "$MINIO_DISTRIBUTED_MODE_ENABLED"; then
+            pgrep -f "$(command -v minio) server" >"$MINIO_PID_FILE"
+            pid="$(get_pid_from_file "$MINIO_PID_FILE")"
+
+            if [[ -n "$pid" ]]; then
+                kill -TERM $pid
+            fi
+        else
+            minio_client_execute_timeout admin service stop local >/dev/null 2>&1 || true
+        fi
 
         local counter=5
         while is_minio_running; do

diff --git a/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/minio/setup.sh b/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/minio/setup.sh
@@ -9,21 +9,12 @@ set -o pipefail
 
 # Load libraries
 . /opt/bitnami/scripts/liblog.sh
+. /opt/bitnami/scripts/libos.sh
 . /opt/bitnami/scripts/libminio.sh
 
 # Load MinIO environment
 . /opt/bitnami/scripts/minio-env.sh
 
-MINIO_SERVER_SCHEME=$(echo "$MINIO_SCHEME" | tr '[:upper:]' '[:lower:]')
-
-export MINIO_SERVER_PORT_NUMBER="$MINIO_API_PORT_NUMBER"
-export MINIO_SERVER_ROOT_USER="${MINIO_ROOT_USER:-}"
-export MINIO_SERVER_ROOT_PASSWORD="${MINIO_ROOT_PASSWORD:-}"
-export MINIO_SERVER_SCHEME
-
-# Load MinIO Client environment
-. /opt/bitnami/scripts/minio-client-env.sh
-
 # Validate settings in MINIO_* env vars.
 minio_validate
 
@@ -33,15 +24,26 @@ minio_regenerate_keys
 if is_boolean_yes "$MINIO_SKIP_CLIENT"; then
     debug "Skipping MinIO client configuration..."
 else
-    if [[ "$MINIO_SERVER_SCHEME" == "https" ]]; then
-        [[ ! -d "${MINIO_CLIENT_CONF_DIR}/certs" ]] && mkdir -p "${MINIO_CLIENT_CONF_DIR}/certs"
-        [[ -d "${MINIO_CERTS_DIR}/CAs" ]] && cp -r "${MINIO_CERTS_DIR}/CAs/" "${MINIO_CLIENT_CONF_DIR}/certs/CAs"
-    fi
     # Start MinIO server in background
     minio_start_bg
     # Ensure MinIO Client is stopped when this script ends.
     trap "minio_stop" EXIT
 
+    # set client env
+    MINIO_SERVER_SCHEME=$(echo "$MINIO_SCHEME" | tr '[:upper:]' '[:lower:]')
+
+    export MINIO_SERVER_PORT_NUMBER="$MINIO_API_PORT_NUMBER"
+    export MINIO_SERVER_ROOT_USER="${MINIO_ROOT_USER:-}"
+    export MINIO_SERVER_ROOT_PASSWORD="${MINIO_ROOT_PASSWORD:-}"
+    export MINIO_SERVER_SCHEME
+    # Load MinIO Client environment
+    . /opt/bitnami/scripts/minio-client-env.sh
+
+    if [[ "$MINIO_SERVER_SCHEME" == "https" ]]; then
+        [[ ! -d "${MINIO_CLIENT_CONF_DIR}/certs" ]] && mkdir -p "${MINIO_CLIENT_CONF_DIR}/certs"
+        [[ -d "${MINIO_CERTS_DIR}/CAs" ]] && cp -r "${MINIO_CERTS_DIR}/CAs/" "${MINIO_CLIENT_CONF_DIR}/certs/CAs"
+    fi
+
     if is_boolean_yes "$MINIO_DISTRIBUTED_MODE_ENABLED" && is_distributed_ellipses_syntax; then
         read -r -a drives <<<"$(minio_distributed_drives)"
         data_drive="${drives[0]}"