From: Sebastien Douheret Date: Thu, 19 Oct 2017 12:47:21 +0000 (+0200) Subject: Fixed auto detection of version X-Git-Tag: v0.3.3~4 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fxds%2Fxds-server.git;a=commitdiff_plain;h=09cffe9749d9d484ec35ebe38106b4c73a971a06 Fixed auto detection of version Signed-off-by: Sebastien Douheret --- diff --git a/scripts/xds-docker-create-container.sh b/scripts/xds-docker-create-container.sh index f493dde..06d1edc 100755 --- a/scripts/xds-docker-create-container.sh +++ b/scripts/xds-docker-create-container.sh @@ -93,24 +93,24 @@ done # Dynamically retrieve image name if [ "$IMAGE" = "" ]; then - IMAGES_LIST=$(docker images $REGISTRY/$REPO/$NAME-$FLAVOUR --format '{{.Tag}}') - VER_NUM=$(echo "$IMAGES_LIST" | wc -l) + VERSION_LIST=$(docker images $REGISTRY/$REPO/$NAME-$FLAVOUR --format '{{.Tag}}') + VER_NUM=$(echo "$VERSION_LIST" | wc -l) if [ $VER_NUM -gt 1 ]; then echo "ERROR: more than one xds image found, please set explicitly the image to use !" echo "List of found images:" - echo "$IMAGES_LIST" + echo "$VERSION_LIST" exit 1 elif [ $VER_NUM -lt 1 ]; then echo "ERROR: cannot automatically retrieve image tag for $REGISTRY/$REPO/$NAME-$FLAVOUR" exit 1 fi - if [ "$IMAGES_LIST" = "" ]; then + if [ "$VERSION_LIST" = "" ]; then echo "ERROR: cannot automatically retrieve image tag for $REGISTRY/$REPO/$NAME-$FLAVOUR" usage exit 1 fi - IMAGE=$REGISTRY/$REPO/$NAME-$FLAVOUR:$VERSION + IMAGE=$REGISTRY/$REPO/$NAME-$FLAVOUR:$VERSION_LIST fi USER=$(id -un)