From 60e9c3a09596a5dc62d900cc76e3e410727fc4ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lio=E6=9D=8E=E6=AD=90?= <lionello@users.noreply.github.com>
Date: Tue, 26 May 2026 16:51:34 -0700
Subject: [PATCH 1/3] Unset config-env-vars and config-vars-init-random

Unset specific input variables in the action script.
---
 action.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/action.yaml b/action.yaml
index dc77d9a..3bc1d8e 100644
--- a/action.yaml
+++ b/action.yaml
@@ -184,6 +184,8 @@ runs:
           y|Y|yes|Yes|YES|true|True|TRUE|on|On|ON|1) params+=("--allow-upgrade") ;;
         esac
 
+        unset ${{ inputs['config-env-vars'] }} ${{ inputs['config-vars-init-random'] }} dont_complain_on_empty
+
         echo defang $COMMAND "${params[@]}"
         output=$(defang $COMMAND "${params[@]}" | tee /dev/stderr)
         echo "stdout<<DEFANG_EOF" >> "$GITHUB_OUTPUT"

From 4735bce78b240ff36544ff86bf8bc129e4586fb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lio=E6=9D=8E=E6=AD=90?= <lionello@users.noreply.github.com>
Date: Tue, 26 May 2026 17:03:12 -0700
Subject: [PATCH 2/3] Apply suggestion from @lionello

---
 action.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/action.yaml b/action.yaml
index 3bc1d8e..486ba17 100644
--- a/action.yaml
+++ b/action.yaml
@@ -184,7 +184,10 @@ runs:
           y|Y|yes|Yes|YES|true|True|TRUE|on|On|ON|1) params+=("--allow-upgrade") ;;
         esac
 
-        unset ${{ inputs['config-env-vars'] }} ${{ inputs['config-vars-init-random'] }} dont_complain_on_empty
+        # Unset config vars to avoid Defang CLI warning user that config from shell env is ignored
+        for var in ${{ inputs['config-env-vars'] }} ${{ inputs['config-vars-init-random'] }}; do
+          unset "$var"
+        done
 
         echo defang $COMMAND "${params[@]}"
         output=$(defang $COMMAND "${params[@]}" | tee /dev/stderr)

From 39c9a2999e57a703aab931f752bca8804627aef6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lio=E6=9D=8E=E6=AD=90?= <lionello@users.noreply.github.com>
Date: Tue, 26 May 2026 17:24:25 -0700
Subject: [PATCH 3/3] Refactor environment variable handling in action.yaml

---
 action.yaml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/action.yaml b/action.yaml
index 486ba17..65ea613 100644
--- a/action.yaml
+++ b/action.yaml
@@ -185,9 +185,7 @@ runs:
         esac
 
         # Unset config vars to avoid Defang CLI warning user that config from shell env is ignored
-        for var in ${{ inputs['config-env-vars'] }} ${{ inputs['config-vars-init-random'] }}; do
-          unset "$var"
-        done
+        unset $CONFIG_ENV_VARS_INIT_RANDOM $CONFIG_ENV_VARS dont_complain_on_empty
 
         echo defang $COMMAND "${params[@]}"
         output=$(defang $COMMAND "${params[@]}" | tee /dev/stderr)
@@ -197,3 +195,6 @@ runs:
       env:
         COMMAND: ${{ inputs['command'] }}
         COMPOSE_FILES: ${{ inputs['compose-files'] }}
+        CONFIG_ENV_VARS: ${{ inputs['config-env-vars'] }}
+        CONFIG_ENV_VARS_INIT_RANDOM: ${{ inputs['config-vars-init-random'] }}
+