[airflow-ci-infra] 01/01: Remove left-over docker containers before fixing permissions

[as...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ash pushed a commit to branch delete-containers-before-chown
in repository https://gitbox.apache.org/repos/asf/airflow-ci-infra.git

commit 31759eadc0372a9f2dfa7ecce40f01b3b5827336
Author: Ash Berlin-Taylor <as...@firemirror.com>
AuthorDate: Mon Mar 1 10:59:30 2021 +0000

    Remove left-over docker containers before fixing permissions
    
    If the docker container is still running and creating files (as might be
    the case for the prod image builds) then some files could be left
    uncleaned, causing the next job to fail.
---
 cloud-init.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cloud-init.yml b/cloud-init.yml
index 778c8d3..7005f54 100644
--- a/cloud-init.yml
+++ b/cloud-init.yml
@@ -120,6 +120,9 @@ write_files:
   - path: /usr/local/sbin/runner-cleanup-workdir.sh
     content: |
       #!/bin/bash
+      echo "Left-over containers:"
+      docker ps -a
+      docker ps -qa | xargs --verbose --no-run-if-empty docker rm -fv
 
       if [[ -d ~runner/actions-runner/_work/airflow/airflow ]]; then
         cd ~runner/actions-runner/_work/airflow/airflow
@@ -133,7 +136,6 @@ write_files:
             git clean -fxd \
           "
         fi
-        docker ps -qa | xargs --no-run-if-empty docker rm -fv
       fi
     owner: root:root
     permissions: '0775'