Merge pull request #5547 from gsiv/master

Docker build.sh: Run aux build scripts in subshell
This commit is contained in:
Finn Stutzenstein 2020-09-07 11:21:41 +02:00 committed by GitHub
commit 5b63809b12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -92,7 +92,7 @@ for i in "${SELECTED_TARGETS[@]}"; do
# Special instructions for local services # Special instructions for local services
build_script="$(dirname "${BASH_SOURCE[0]}")/../${i}/build.sh" build_script="$(dirname "${BASH_SOURCE[0]}")/../${i}/build.sh"
if [[ -f "$build_script" ]]; then if [[ -f "$build_script" ]]; then
. "$build_script" ( . "$build_script" )
else else
docker build --tag "$img" --pull "${OPTIONS[@]}" "$loc" docker build --tag "$img" --pull "${OPTIONS[@]}" "$loc"
fi fi