github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 06:37:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

BUILD: Prevent zombie Docker Runs

Browse source 
Fixes #8953
This commit is contained in:
Armin 2018-01-16 14:06:35 +01:00 • committed by Armin Braun
parent 33b151707a
commit e653f7e707
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ci/docker_integration_tests.sh
View file

@ -1,4 +1,4 @@
#!/bin/bash -i
#!/bin/bash
#Note - ensure that the -e flag is NOT set, and explicitly check the $? status to allow for clean up
if [ -z "$branch_specifier" ]; then
@ -13,7 +13,7 @@ echo "Running Docker CI build for '$IMAGE_NAME' "
docker build -t $IMAGE_NAME .
exit_code=$?; [[ $exit_code != 0 ]] && exit $exit_code
docker run -t --rm $IMAGE_NAME ci/integration_tests.sh $@
docker run --sig-proxy=true --rm $IMAGE_NAME ci/integration_tests.sh $@
exit_code=$?
[[ $IMAGE_NAME != "logstash-integration-tests" ]] && docker rmi $IMAGE_NAME
echo "exiting with code: '$exit_code'"

4
ci/docker_unit_tests.sh
View file

@ -1,4 +1,4 @@
#!/bin/bash -i
#!/bin/bash
#Note - ensure that the -e flag is NOT set, and explicitly check the $? status to allow for clean up
if [ -z "$branch_specifier" ]; then
@ -13,7 +13,7 @@ echo "Running Docker CI build for '$IMAGE_NAME' "
docker build -t $IMAGE_NAME .
exit_code=$?; [[ $exit_code != 0 ]] && exit $exit_code
docker run -t --rm $IMAGE_NAME ci/unit_tests.sh $@
docker run --sig-proxy=true --rm $IMAGE_NAME ci/unit_tests.sh $@
exit_code=$?
[[ $IMAGE_NAME != "logstash-unit-tests" ]] && docker rmi $IMAGE_NAME
echo "exiting with code: '$exit_code'"