Fix path references to Ansible vault when running with Docker

serversideup · Dec 18, 2024 · 936dd97 · 936dd97
1 parent 7989d2e
commit 936dd97
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/lib/actions/vault.sh b/lib/actions/vault.sh
@@ -14,7 +14,7 @@ action_vault(){
         vault_run_command=("ansible-vault")
         run_type="local"
     else
-        vault_run_command=("run_ansible" "--mount-path" "$(pwd)" "ansible-vault")
+        vault_run_command=("run_ansible" "--mount-path" "$(pwd):/ansible" "ansible-vault")
         run_type="docker"
     fi
 

diff --git a/lib/functions.sh b/lib/functions.sh
@@ -1351,7 +1351,7 @@ set_ansible_vault_args() {
       fi
     fi
 
-    vault_args+=("--vault-password-file" ".vault-password")
+    vault_args+=("--vault-password-file" "/ansible/.vault-password")
   elif is_encrypted_with_ansible_vault "$variable_file" || is_encrypted_with_ansible_vault ".spin-inventory.ini"; then
     echo "${BOLD}${YELLOW}🔐 '.vault-password' file not found. You will be prompted to enter your vault password.${RESET}" >&2
     vault_args+=("--ask-vault-pass")
@@ -1361,6 +1361,9 @@ set_ansible_vault_args() {
 }
 
 setup_color() {
+    # Disable debug tracing temporarily
+    { set +x; } 2>/dev/null
+
     RAINBOW="
       $(printf '\033[38;5;196m')
       $(printf '\033[38;5;202m')
@@ -1374,6 +1377,11 @@ setup_color() {
     BOLD=$(printf '\033[1m')
     RESET=$(printf '\033[m')
     MAGENTA=$(printf '\033[1;35m')
+
+    # Restore debug tracing if it was enabled
+    if [[ "${SPIN_DEBUG:-false}" == "true" ]]; then
+        set -x
+    fi
 }
 
 show_existing_files_warning() {