Merge branch 'main' into main

Author: ianco

scripts/run_docker

@@ -27,13 +27,13 @@ for arg in "$@"; do
     echo "Backing up database before running aca-py upgrade is highly recommended. Do you wish to proceed"
     select yn in "Yes" "No"; do
       case $yn in
-      Yes) break ;;
-      No) exit ;;
+        Yes) break ;;
+        No) exit ;;
       esac
     done
   fi
 done
-ACAPY_NETWORK_NAME="${NETWORK_NAME}"
+
 if [ -n "${ENABLE_PTVSD}" ]; then
   ARGS="${ARGS} -e ENABLE_PTVSD=\"${ENABLE_PTVSD}\" -p $PTVSD_PORT:$PTVSD_PORT"
 fi
@@ -48,13 +48,28 @@ if [ "$OSTYPE" == "msys" ]; then
   CONTAINER_RUNTIME="winpty docker"
 fi
 
-RAND_NAME=$(env LC_ALL=C tr -dc 'a-zA-Z0-9' < /dev/urandom | fold -w 16 | head -n 1)
-if [ -z "$NETWORK_NAME" ]; then
-  echo "No Docker network specified."
-  $CONTAINER_RUNTIME run --rm -ti --name "aries-cloudagent-runner_${RAND_NAME}" \
-    $ARGS aries-cloudagent-run "$@"
+if [ -n "${CONTAINER_NAME}" ]; then
+  ARGS="${ARGS} --name ${CONTAINER_NAME}"
+else
+  RAND_NAME=$(env LC_ALL=C tr -dc 'a-zA-Z0-9' </dev/urandom | fold -w 16 | head -n 1)
+  CONTAINER_NAME="aries-cloudagent-runner_${RAND_NAME}"
+  ARGS="${ARGS} --name ${CONTAINER_NAME}"
+fi
+echo ""
+echo "Container name: ${CONTAINER_NAME}"
+
+# Create new Docker network if it does not exist.
+if [ -n "${NETWORK_NAME}" ]; then
+  if [ -z "$("$CONTAINER_RUNTIME" network ls --filter name=^"${NETWORK_NAME}"$ --format="{{ .Name }}")" ]; then
+    echo "Creating new Docker network: ${NETWORK_NAME}"
+    "$CONTAINER_RUNTIME" network create "${NETWORK_NAME}"
+  else
+    echo "Attaching to existing Docker network: ${NETWORK_NAME}"
+  fi
+  ARGS="${ARGS} --network ${NETWORK_NAME}"
 else
-  echo "${ACAPY_NETWORK_NAME} Docker network specified."
-  $CONTAINER_RUNTIME run --rm -ti --network $ACAPY_NETWORK_NAME --name "aries-cloudagent-runner_${RAND_NAME}" \
-    $ARGS aries-cloudagent-run "$@"
+  echo "No Docker network specified."
 fi
+echo ""
+
+$CONTAINER_RUNTIME run --rm -ti $ARGS aries-cloudagent-run "$@"