From 32949fb349d004232ebaa3d44b99de528657e6b1 Mon Sep 17 00:00:00 2001
From: Greg Bowler <greg.bowler@g105b.com>
Date: Wed, 5 May 2021 13:34:28 +0100
Subject: [PATCH 01/14] upgrade to php-build v2.1.0

---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index 38164cc..b5733b9 100644
--- a/action.yml
+++ b/action.yml
@@ -90,7 +90,7 @@ runs:
         ACTION_SSH_DOMAIN: ${{ inputs.ssh_domain }}
         ACTION_WORKING_DIR: ${{ inputs.working_dir }}
       id: composer_run
-      run: bash <(curl -s https://raw.githubusercontent.com/php-actions/php-build/330b13bbb1eadd05bbb627477c1549cd7e62e406/php-build.bash) composer \
+      run: bash <(curl -s https://github.com/php-actions/php-build/blob/v2.1.0/php-build.bash) composer \
         && ${{ github.action_path }}/composer-action.bash || { cat ${{ github.workspace }}/output.log ; exit 1; }
       shell: bash
 

From e72797d6dfd9261c88138465d7ac1aa37b05d0d3 Mon Sep 17 00:00:00 2001
From: Greg Bowler <greg.bowler@g105b.com>
Date: Wed, 5 May 2021 13:41:26 +0100
Subject: [PATCH 02/14] correct build path

---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index b5733b9..9513403 100644
--- a/action.yml
+++ b/action.yml
@@ -90,7 +90,7 @@ runs:
         ACTION_SSH_DOMAIN: ${{ inputs.ssh_domain }}
         ACTION_WORKING_DIR: ${{ inputs.working_dir }}
       id: composer_run
-      run: bash <(curl -s https://github.com/php-actions/php-build/blob/v2.1.0/php-build.bash) composer \
+      run: bash <(curl -s https://raw.githubusercontent.com/php-actions/php-build/v2.1.0/php-build.bash) composer \
         && ${{ github.action_path }}/composer-action.bash || { cat ${{ github.workspace }}/output.log ; exit 1; }
       shell: bash
 

From a530235113fa0c3d6fe5ac73742923cbe57f30cd Mon Sep 17 00:00:00 2001
From: Greg Bowler <greg.bowler@g105b.com>
Date: Wed, 12 May 2021 12:15:10 +0100
Subject: [PATCH 03/14] debug contents of GITHUB_ENV

---
 composer-action.bash | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/composer-action.bash b/composer-action.bash
index ad42dfc..d11e9e5 100755
--- a/composer-action.bash
+++ b/composer-action.bash
@@ -136,6 +136,11 @@ export COMPOSER_CACHE_DIR="/tmp/composer-cache"
 unset ACTION_SSH_KEY
 unset ACTION_SSH_KEY_PUB
 
+echo "*************DEBUG******************"
+echo "contents of GITHUB_ENV file:"
+cat GITHUB_ENV
+echo "*************/DEBUG******************"
+
 docker run --rm \
 	--volume "${github_action_path}/composer.phar":/usr/local/bin/composer \
 	--volume ~/.gitconfig:/root/.gitconfig \

From c6bde3bab859f1583e1ea5e6e4ff7dbdf27ec702 Mon Sep 17 00:00:00 2001
From: Greg Bowler <greg.bowler@g105b.com>
Date: Wed, 12 May 2021 12:17:35 +0100
Subject: [PATCH 04/14] debug contents of GITHUB_ENV

---
 composer-action.bash | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer-action.bash b/composer-action.bash
index d11e9e5..485eabc 100755
--- a/composer-action.bash
+++ b/composer-action.bash
@@ -137,8 +137,8 @@ unset ACTION_SSH_KEY
 unset ACTION_SSH_KEY_PUB
 
 echo "*************DEBUG******************"
-echo "contents of GITHUB_ENV file:"
-cat GITHUB_ENV
+echo "contents of GITHUB_ENV ($GITHUB_ENV):"
+cat $GITHUB_ENV
 echo "*************/DEBUG******************"
 
 docker run --rm \

From 210b788331fa5933da0a51fa151abd8426d58f50 Mon Sep 17 00:00:00 2001
From: Greg Bowler <greg.bowler@g105b.com>
Date: Fri, 21 May 2021 15:48:01 +0100
Subject: [PATCH 05/14] debug: output docker env vars

---
 composer-action.bash | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer-action.bash b/composer-action.bash
index 485eabc..5db3942 100755
--- a/composer-action.bash
+++ b/composer-action.bash
@@ -136,10 +136,10 @@ export COMPOSER_CACHE_DIR="/tmp/composer-cache"
 unset ACTION_SSH_KEY
 unset ACTION_SSH_KEY_PUB
 
-echo "*************DEBUG******************"
-echo "contents of GITHUB_ENV ($GITHUB_ENV):"
-cat $GITHUB_ENV
-echo "*************/DEBUG******************"
+dockerEnv=$(docker run --rm ${docker_tag} env)
+echo "Environment variables within Docker:"
+echo $dockerEnv
+exit
 
 docker run --rm \
 	--volume "${github_action_path}/composer.phar":/usr/local/bin/composer \

From c98496dbda4189c3545253b0286f6abf6fd79523 Mon Sep 17 00:00:00 2001
From: Greg Bowler <greg.bowler@g105b.com>
Date: Fri, 21 May 2021 15:54:09 +0100
Subject: [PATCH 06/14] debug: compare docker/host env

---
 composer-action.bash | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/composer-action.bash b/composer-action.bash
index 5db3942..759c5c4 100755
--- a/composer-action.bash
+++ b/composer-action.bash
@@ -136,9 +136,21 @@ export COMPOSER_CACHE_DIR="/tmp/composer-cache"
 unset ACTION_SSH_KEY
 unset ACTION_SSH_KEY_PUB
 
+hostEnv=$(env)
 dockerEnv=$(docker run --rm ${docker_tag} env)
 echo "Environment variables within Docker:"
-echo $dockerEnv
+while IFS= read -r line
+do
+	echo "... $line ..."
+done <<<$dockerEnv
+
+echo "********************************************"
+echo "Environment variables within Host:"
+while IFS= read -r line
+do
+	echo "... $line ..."
+done <<<$hostEnv
+
 exit
 
 docker run --rm \

From 4240653d08ee63a3fc269dcc990e411018e850ff Mon Sep 17 00:00:00 2001
From: Greg Bowler <greg.bowler@g105b.com>
Date: Fri, 21 May 2021 16:17:13 +0100
Subject: [PATCH 07/14] debug: compare docker/host env

---
 composer-action.bash | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/composer-action.bash b/composer-action.bash
index 759c5c4..02da7f7 100755
--- a/composer-action.bash
+++ b/composer-action.bash
@@ -136,20 +136,21 @@ export COMPOSER_CACHE_DIR="/tmp/composer-cache"
 unset ACTION_SSH_KEY
 unset ACTION_SSH_KEY_PUB
 
-hostEnv=$(env)
-dockerEnv=$(docker run --rm ${docker_tag} env)
-echo "Environment variables within Docker:"
+envHostKeys=()
 while IFS= read -r line
 do
-	echo "... $line ..."
-done <<<$dockerEnv
+	envHostKeys+=( $(echo "$line" | cut -f1 -d=) )
+done <<<$(env)
+
+echo "KEYS NOT IN DOCKER:"
 
-echo "********************************************"
-echo "Environment variables within Host:"
 while IFS= read -r line
 do
-	echo "... $line ..."
-done <<<$hostEnv
+	if [[ ! " ${envHostKeys[@]} " =~ " ${line} " ]]
+	then
+	    echo $line
+	fi
+done <<<$(docker run --rm "${docker_tag}" env)
 
 exit
 

From b0a504153ad3119f14327f07c8228551b7c7acf5 Mon Sep 17 00:00:00 2001
From: Greg Bowler <greg.bowler@g105b.com>
Date: Fri, 21 May 2021 16:21:01 +0100
Subject: [PATCH 08/14] debug: compare docker/host env (inverse logic)

---
 composer-action.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer-action.bash b/composer-action.bash
index 02da7f7..771ec24 100755
--- a/composer-action.bash
+++ b/composer-action.bash
@@ -146,7 +146,7 @@ echo "KEYS NOT IN DOCKER:"
 
 while IFS= read -r line
 do
-	if [[ ! " ${envHostKeys[@]} " =~ " ${line} " ]]
+	if [[ " ${envHostKeys[@]} " =~ " ${line} " ]]
 	then
 	    echo $line
 	fi

From 26b835aa3bb32b28a945dd62a46295f267c1c97a Mon Sep 17 00:00:00 2001
From: Greg Bowler <greg.bowler@g105b.com>
Date: Fri, 21 May 2021 16:25:28 +0100
Subject: [PATCH 09/14] debug: compare docker/host env

---
 composer-action.bash | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer-action.bash b/composer-action.bash
index 771ec24..a98a48a 100755
--- a/composer-action.bash
+++ b/composer-action.bash
@@ -146,9 +146,9 @@ echo "KEYS NOT IN DOCKER:"
 
 while IFS= read -r line
 do
-	if [[ " ${envHostKeys[@]} " =~ " ${line} " ]]
-	then
-	    echo $line
+	key=$(echo "$line" | cut -f1 -d=)
+	if printf '%s\n' "${envHostKeys[@]}" | grep -q -P "^${key}\$"; then
+    		echo "$line"
 	fi
 done <<<$(docker run --rm "${docker_tag}" env)
 

From f47715561e9b79c670d90760e2720d8188236718 Mon Sep 17 00:00:00 2001
From: Greg Bowler <greg.bowler@g105b.com>
Date: Fri, 21 May 2021 16:27:04 +0100
Subject: [PATCH 10/14] debug: output extracted vars

---
 composer-action.bash | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/composer-action.bash b/composer-action.bash
index a98a48a..379c666 100755
--- a/composer-action.bash
+++ b/composer-action.bash
@@ -148,10 +148,16 @@ while IFS= read -r line
 do
 	key=$(echo "$line" | cut -f1 -d=)
 	if printf '%s\n' "${envHostKeys[@]}" | grep -q -P "^${key}\$"; then
-    		echo "$line"
+    		echo "Skipping $line"
+	else
+		echo "Adding $line"
+		echo "$line" >> DOCKER_ENV
 	fi
 done <<<$(docker run --rm "${docker_tag}" env)
 
+echo "Output of DOCKER_ENV:"
+cat ./DOCKER_ENV
+
 exit
 
 docker run --rm \

From 65924259371940d8a57dc5013c497e3082133c8d Mon Sep 17 00:00:00 2001
From: Greg Bowler <greg.bowler@g105b.com>
Date: Fri, 21 May 2021 16:32:59 +0100
Subject: [PATCH 11/14] debug: output host keys

---
 composer-action.bash | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/composer-action.bash b/composer-action.bash
index 379c666..9179750 100755
--- a/composer-action.bash
+++ b/composer-action.bash
@@ -142,7 +142,13 @@ do
 	envHostKeys+=( $(echo "$line" | cut -f1 -d=) )
 done <<<$(env)
 
-echo "KEYS NOT IN DOCKER:"
+echo "Host keys:"
+for key in "${envHostKeys[@]}"
+do
+	echo "Host: $key"
+done
+
+echo "**********************************"
 
 while IFS= read -r line
 do

From 64eacb1a32ae362875e3586d86399f1d99fab6c3 Mon Sep 17 00:00:00 2001
From: Greg Bowler <greg.bowler@g105b.com>
Date: Fri, 21 May 2021 16:34:44 +0100
Subject: [PATCH 12/14] debug: reverse logic

---
 composer-action.bash | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/composer-action.bash b/composer-action.bash
index 9179750..a8ef503 100755
--- a/composer-action.bash
+++ b/composer-action.bash
@@ -136,30 +136,22 @@ export COMPOSER_CACHE_DIR="/tmp/composer-cache"
 unset ACTION_SSH_KEY
 unset ACTION_SSH_KEY_PUB
 
-envHostKeys=()
+dockerKeys=()
 while IFS= read -r line
 do
-	envHostKeys+=( $(echo "$line" | cut -f1 -d=) )
-done <<<$(env)
-
-echo "Host keys:"
-for key in "${envHostKeys[@]}"
-do
-	echo "Host: $key"
-done
-
-echo "**********************************"
+	dockerKeys+=( $(echo "$line" | cut -f1 -d=) )
+done <<<$(docker run --rm "${docker_tag}" env)
 
 while IFS= read -r line
 do
 	key=$(echo "$line" | cut -f1 -d=)
-	if printf '%s\n' "${envHostKeys[@]}" | grep -q -P "^${key}\$"; then
+	if printf '%s\n' "${dockerKeys[@]}" | grep -q -P "^${key}\$"; then
     		echo "Skipping $line"
 	else
 		echo "Adding $line"
 		echo "$line" >> DOCKER_ENV
 	fi
-done <<<$(docker run --rm "${docker_tag}" env)
+done <<<$(env)
 
 echo "Output of DOCKER_ENV:"
 cat ./DOCKER_ENV

From 2ff57fc8ccbe75304665febd6e53f647c2cd48a1 Mon Sep 17 00:00:00 2001
From: Greg Bowler <greg.bowler@g105b.com>
Date: Fri, 21 May 2021 16:44:01 +0100
Subject: [PATCH 13/14] wip: pass actual docker env file to docker

---
 composer-action.bash | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/composer-action.bash b/composer-action.bash
index a8ef503..1d196ff 100755
--- a/composer-action.bash
+++ b/composer-action.bash
@@ -148,16 +148,10 @@ do
 	if printf '%s\n' "${dockerKeys[@]}" | grep -q -P "^${key}\$"; then
     		echo "Skipping $line"
 	else
-		echo "Adding $line"
 		echo "$line" >> DOCKER_ENV
 	fi
 done <<<$(env)
 
-echo "Output of DOCKER_ENV:"
-cat ./DOCKER_ENV
-
-exit
-
 docker run --rm \
 	--volume "${github_action_path}/composer.phar":/usr/local/bin/composer \
 	--volume ~/.gitconfig:/root/.gitconfig \
@@ -165,7 +159,7 @@ docker run --rm \
 	--volume "${GITHUB_WORKSPACE}":/app \
 	--volume "/tmp/composer-cache":/tmp/composer-cache \
 	--workdir /app \
-	--env-file <( env| cut -f1 -d= ) \
+	--env-file ./DOCKER_ENV \
 	${docker_tag} ${command_string}
 
 echo "::set-output name=full_command::${command_string}"

From ddf3c6421b104f987e404e167184fe8344ef751e Mon Sep 17 00:00:00 2001
From: Greg Bowler <greg.bowler@g105b.com>
Date: Fri, 21 May 2021 16:49:56 +0100
Subject: [PATCH 14/14] wip: quiet skipping

---
 composer-action.bash | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/composer-action.bash b/composer-action.bash
index 1d196ff..90fd43f 100755
--- a/composer-action.bash
+++ b/composer-action.bash
@@ -145,8 +145,9 @@ done <<<$(docker run --rm "${docker_tag}" env)
 while IFS= read -r line
 do
 	key=$(echo "$line" | cut -f1 -d=)
-	if printf '%s\n' "${dockerKeys[@]}" | grep -q -P "^${key}\$"; then
-    		echo "Skipping $line"
+	if printf '%s\n' "${dockerKeys[@]}" | grep -q -P "^${key}\$"
+	then
+    		echo "Skipping env variable $key" >> output.log
 	else
 		echo "$line" >> DOCKER_ENV
 	fi