Auto retrieve docker image tag

[src/xds/xds-server.git] / scripts / xds-docker-create-container.sh

diff --git a/scripts/xds-docker-create-container.sh b/scripts/xds-docker-create-container.sh
index b75ecfd..0adc2d9 100755 (executable)
--- a/scripts/xds-docker-create-container.sh
+++ b/scripts/xds-docker-create-container.sh
@@ -22,7 +22,7 @@ REGISTRY=docker.automotivelinux.org
 REPO=agl
 NAME=worker
 FLAVOUR=xds
-VERSION=3.99.1
+VERSION=4.0
 
 # ---------------------------------------------------
 # --- computed - don't touch !
@@ -30,6 +30,16 @@ VERSION=3.99.1
 DOCKER_USER=devel
 
 DEFIMAGE=$REGISTRY/$REPO/$NAME-$FLAVOUR:$VERSION
+docker images |grep $DEFIMAGE 2>&1 > /dev/null
+if [ "$?" = "1" ]; then
+    VERSION=`docker images $REGISTRY/$REPO/$NAME-$FLAVOUR:* --format "{{.Tag}}"`
+    if [ "$VERSION" = "" ]; then
+        echo "ERROR: cannot automatically retrieve image tag for $REGISTRY/$REPO/$NAME-$FLAVOUR"
+        exit 1
+    fi
+    DEFIMAGE=$REGISTRY/$REPO/$NAME-$FLAVOUR:$VERSION
+fi
+
 
 function usage() {
        echo "Usage: $(basename $0) <instance ID> [image name]"  >&2
@@ -61,13 +71,16 @@ while [ $# -ne 0 ]; do
     shift
 done
 
-[ "$ID" = "" ] && usage
+[ "$ID" = "" ] && ID=0
 
 USER=$(id -un)
 echo "Using instance ID #$ID (user $(id -un))"
 
 NAME=agl-xds-$(hostname|cut -f1 -d'.')-$ID-$USER
 
+docker ps -a |grep "$NAME" > /dev/null
+[ "$?" = "0" ] && { echo "Image name already exist ! (use -h option to read help)"; exit 1; }
+
 MIRRORDIR=$HOME/ssd/localmirror_$ID
 XDTDIR=$HOME/ssd/xdt_$ID
 SHAREDDIR=$HOME/$DOCKER_USER/docker/share
@@ -96,11 +109,11 @@ if [ "$?" != "0" ]; then
 fi
 
 if ($FORCE); then
-    echo "Stoping xds-server..."
-    docker exec --user $DOCKER_USER  ${NAME} bash -c "/usr/local/bin/xds-server-stop.sh" || exit 1
+    echo "Stopping xds-server..."
+    docker exec -t ${NAME} bash -c "systemctl stop xds-server" || exit 1
     sleep 1
     echo "Starting xds-server..."
-    docker exec --user $DOCKER_USER  ${NAME} bash -c "nohup /usr/local/bin/xds-server-start.sh" || exit 1
+    docker exec -t ${NAME} bash -c "systemctl start xds-server" || exit 1
 fi
 
 echo "Copying your identity to container $NAME"
@@ -111,7 +124,7 @@ max=30
 count=0
 while [ $res -ne 0 ] && [ $count -le $max ]; do
     sleep 1
-    docker exec ${NAME} bash -c "systemctl status ssh" 2>/dev/null 1>&2 
+    docker exec ${NAME} bash -c "systemctl status ssh" 2>/dev/null 1>&2
     res=$?
     echo -n "."
     count=$(expr $count + 1);