From caee3e6f3a9c8a166d5ee9d3feb6d633fc3a8997 Mon Sep 17 00:00:00 2001 From: Jackson Delahunt Date: Sat, 12 Sep 2020 03:55:34 +1000 Subject: [PATCH] unique --- docker/scripts/test.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/docker/scripts/test.sh b/docker/scripts/test.sh index 01acce5..30f95ce 100755 --- a/docker/scripts/test.sh +++ b/docker/scripts/test.sh @@ -3,10 +3,13 @@ REPO_ROOT=$(dirname $(readlink -f $0))/../.. # Export desktop environment shell configuration eval "$($REPO_ROOT/docker/scripts/environment.sh)" -# Ensure the desktop environment network exists +# Ensure the desktop environment test network exists docker network create $DESKTOP_ENVIRONMENT_DOCKER_NETWORK -# Start the desktop environment container +# Set the desktop environment test container name +DESKTOP_ENVIRONMENT_CONTAINER_NAME=${DESKTOP_ENVIRONMENT_CONTAINER_IMAGE}-test-$(date +%s) + +# Start the desktop environment test container docker run \ --detach \ --env DESKTOP_ENVIRONMENT_USER \ @@ -20,7 +23,7 @@ docker run \ # Wait until the desktop environment test container is running before proceeding until docker inspect $DESKTOP_ENVIRONMENT_CONTAINER_NAME | grep Status | grep -m 1 running >/dev/null; do sleep 1; done -# Start the vnc server inside the desktop environment container +# Start the vnc server inside the desktop environment test container $REPO_ROOT/docker/scripts/exec.sh /home/$DESKTOP_ENVIRONMENT_USER/.config/scripts/startup.sh # Check desktop environment vnc server started successfully