Stop running windows containers if they exist (#395)

ros2 · Feb 29, 2020 · 434af51 · 434af51
1 parent e72bca4
commit 434af51
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/job_templates/ci_job.xml.em b/job_templates/ci_job.xml.em
@@ -434,6 +434,9 @@ echo Using args: !CI_ARGS!
 echo "# END SECTION"
 
 echo "# BEGIN SECTION: Run DockerFile"
+rem Kill any running docker containers, which may be leftover from aborted jobs
+powershell -Command "if ($(docker ps -q) -ne $null) { docker stop $(docker ps -q)}"
+
 rem If isolated_network doesn't already exist, create it
 set NETWORK_NAME=isolated_network
 docker network inspect %NETWORK_NAME% 2>nul 1>nul || docker network create -d nat -o com.docker.network.bridge.enable_icc=false %NETWORK_NAME%

diff --git a/job_templates/packaging_job.xml.em b/job_templates/packaging_job.xml.em
@@ -400,6 +400,9 @@ echo Using args: !CI_ARGS!
 echo "# END SECTION"
 
 echo "# BEGIN SECTION: Run packaging script with DockerFile"
+rem Kill any running docker containers, which may be leftover from aborted jobs
+powershell -Command "if ($(docker ps -q) -ne $null) { docker stop $(docker ps -q)}"
+
 rem If isolated_network doesn't already exist, create it
 set NETWORK_NAME=isolated_network
 docker network inspect %NETWORK_NAME% 2>nul 1>nul || docker network create -d nat -o com.docker.network.bridge.enable_icc=false %NETWORK_NAME%