From cc9d43b01e725bc12ce1fb2bf202c33e1a475aa7 Mon Sep 17 00:00:00 2001
From: Kai Lueke <kailuke@microsoft.com>
Date: Wed, 16 Mar 2022 15:55:14 +0100
Subject: [PATCH] run_sdk_container: add remove flag

At the moment one must remove the leftover containers manually.
Add a flag to do so when stopping the container.
---
 run_sdk_container | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/run_sdk_container b/run_sdk_container
index aa934ab68c..8ddf7a9858 100755
--- a/run_sdk_container
+++ b/run_sdk_container
@@ -16,11 +16,12 @@ os_version="$(get_git_version)"
 sdk_version="$(get_sdk_version_from_versionfile)"
 custom_image=""
 tty=""
+remove=""
 cleanup=""
 
 usage() {
     echo "  Usage:"
-    echo "  $0 [-t] [-v <version>] [-V sdk version] [-a arch] [-n <name> ] [-x <script>] [-C custom-container] [-F] [container-command]"
+    echo "  $0 [-t] [-v <version>] [-V sdk version] [-a arch] [-n <name> ] [-x <script>] [-C custom-container] [-F] [--rm] [container-command]"
     echo "       Start an SDK container of a given SDK release version."
     echo "       This will create the container if it does not exist, otherwise start the existing container."
     echo "       If the container is already running then it will exec into the container."
@@ -37,6 +38,7 @@ usage() {
     echo "      -a <amd64|arm64|all> - Target architecture (board support) of the SDK."
     echo "                     'all' (the default) contains support for both amd64 and arm64."
     echo "      -n <name>    - Custom name to use for the container."
+    echo "      --rm           Remove container afterwards"
     echo "      -x <script>  - For each resource generated during build (container etc.)"
     echo "                     add a cleanup line to <script> which, when run, will free"
     echo "                     the resource. Useful for CI."
@@ -57,6 +59,7 @@ while [ 0 -lt $# ] ; do
     -V) sdk_version="$2";   shift; shift;;
     -a) arch="$2";          shift; shift;;
     -n) name="$2";          shift; shift;;
+    --rm) remove=true;             shift;;
     -x) cleanup="$2";       shift; shift;;
     -C) custom_image="$2";  shift; shift;;
     *) break;;
@@ -127,7 +130,12 @@ fi
 
 if [ "$stat" != "Up" ] ; then
     yell "Starting stopped container '$name'"
-    trap "$docker stop -t 0 $name" EXIT
+    if [ "${remove}" = "true" ]; then
+      remove_command="$docker rm -f $name"
+    else
+      remove_command=":"
+    fi
+    trap "$docker stop -t 0 $name ; ${remove_command}" EXIT
     $docker start "$name"
 fi