From 003cc7721a52a75e4f3f4e09d264388d811d2e12 Mon Sep 17 00:00:00 2001 From: Andreas Wicenec Date: Fri, 20 Sep 2024 10:06:02 +0800 Subject: [PATCH] fixed warning for docker builds --- daliuge-common/build_common.sh | 2 +- daliuge-engine/build_engine.sh | 2 +- daliuge-engine/run_engine.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/daliuge-common/build_common.sh b/daliuge-common/build_common.sh index 599cf2815..f7c135049 100755 --- a/daliuge-common/build_common.sh +++ b/daliuge-common/build_common.sh @@ -5,7 +5,7 @@ case "$1" in "dep") - export VCS_TAG=`git describe --tags --abbrev=0|sed s/v//` + export VCS_TAG=`git describe --tags --abbrev=0 --always|sed s/v//` echo "Building daliuge-common version using tag ${VCS_TAG}" docker build --build-arg VCS_TAG=${VCS_TAG} --no-cache -t icrar/daliuge-common:${VCS_TAG} -f docker/Dockerfile . echo "Build finished!" diff --git a/daliuge-engine/build_engine.sh b/daliuge-engine/build_engine.sh index a4c87cdb7..8e23f7437 100755 --- a/daliuge-engine/build_engine.sh +++ b/daliuge-engine/build_engine.sh @@ -3,7 +3,7 @@ # branch name or with a release tag depending whether this is a development or deployment # version. -export VCS_TAG=`git describe --tags --abbrev=0|sed s/v//` +export VCS_TAG=`git describe --tags --abbrev=0 --always|sed s/v//` export DEV_TAG=`git rev-parse --abbrev-ref HEAD | tr '[:upper:]' '[:lower:]'` case "$1" in diff --git a/daliuge-engine/run_engine.sh b/daliuge-engine/run_engine.sh index 7f33a9d9d..3fbfa2ef2 100755 --- a/daliuge-engine/run_engine.sh +++ b/daliuge-engine/run_engine.sh @@ -29,7 +29,7 @@ then export VCS_TAG=$2 export C_TAG=$VCS_TAG else - export VCS_TAG=`git describe --tags --abbrev=0|sed s/v//` + export VCS_TAG=`git describe --tags --abbrev=0 --always|sed s/v//` export C_TAG=`git rev-parse --abbrev-ref HEAD | tr '[:upper:]' '[:lower:]'` fi case "$1" in