Skip to content

Commit d936bcb

Browse files
author
Greg Bowler
committed
Merge branch '40-env'
# Conflicts: # action.yml # composer-action.bash
2 parents c115e89 + ddf3c64 commit d936bcb

File tree

1 file changed

+18
-1
lines changed

1 file changed

+18
-1
lines changed

composer-action.bash

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,23 @@ export COMPOSER_CACHE_DIR="/tmp/composer-cache"
143143
unset ACTION_SSH_KEY
144144
unset ACTION_SSH_KEY_PUB
145145

146+
dockerKeys=()
147+
while IFS= read -r line
148+
do
149+
dockerKeys+=( $(echo "$line" | cut -f1 -d=) )
150+
done <<<$(docker run --rm "${docker_tag}" env)
151+
152+
while IFS= read -r line
153+
do
154+
key=$(echo "$line" | cut -f1 -d=)
155+
if printf '%s\n' "${dockerKeys[@]}" | grep -q -P "^${key}\$"
156+
then
157+
echo "Skipping env variable $key" >> output.log
158+
else
159+
echo "$line" >> DOCKER_ENV
160+
fi
161+
done <<<$(env)
162+
146163
echo "::set-output name=full_command::${command_string}"
147164

148165
docker run --rm \
@@ -152,7 +169,7 @@ docker run --rm \
152169
--volume "${GITHUB_WORKSPACE}":/app \
153170
--volume "/tmp/composer-cache":/tmp/composer-cache \
154171
--workdir /app \
172+
--env-file ./DOCKER_ENV \
155173
--network host \
156-
--env-file <( env| cut -f1 -d= ) \
157174
${memory_limit} \
158175
${docker_tag} ${command_string}

0 commit comments

Comments
 (0)