cleanup after ourselvesHEADmaster

1 files changed, 11 insertions, 5 deletions

diff --git a/.scripts.d/30-test.sh b/.scripts.d/30-test.sh
index ae4e78c..bf84a36 100644
--- a/.scripts.d/30-test.sh
+++ b/.scripts.d/30-test.sh
@@ -10,6 +10,17 @@ command -v docker >/dev/null 2>&1 || {
 	exit 1
 }
 
+# shellcheck disable=SC2001
+REGISTRY=$(echo "${GITHUB_SERVER_URL}" | sed -e 's|^[^/]*//||')
+TAG="${GITHUB_RUN_ID}"
+IMAGE_NAME="${REGISTRY}/${GITHUB_REPOSITORY,,}:${TAG}"
+
+function cleanup() {
+    docker stop "$(docker ps -aq --filter "ancestor=${IMAGE_NAME}")" >/dev/null 2>&1 || true
+    docker rm "$(docker ps -aq --filter "ancestor=${IMAGE_NAME}")" >/dev/null 2>&1 || true
+}
+trap cleanup EXIT
+
 # install goss
 curl -fsSL https://goss.rocks/install | sh
 
@@ -30,11 +41,6 @@ fi
 goss --gossfile goss.yaml render >goss-full.yaml
 mv goss-full.yaml goss.yaml
 
-# shellcheck disable=SC2001
-REGISTRY=$(echo "${GITHUB_SERVER_URL}" | sed -e 's|^[^/]*//||')
-TAG="${GITHUB_RUN_ID}"
-IMAGE_NAME="${REGISTRY}/${GITHUB_REPOSITORY,,}:${TAG}"
-
 echo "${GITEA_REGISTRY_TOKEN}" |
     docker login "${REGISTRY}" -u "${GITEA_REGISTRY_USER}" --password-stdin