diff --git a/VERSION.txt b/VERSION.txt index 041792e..80c4caf 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -4.0.13 +4.0.14 diff --git a/image-ngc/env b/image-ngc/env index fe68e05..2670165 100644 --- a/image-ngc/env +++ b/image-ngc/env @@ -12,10 +12,9 @@ OS_CONFIG=${OS_CONFIG:-standalone} # The sources to build -OS_GIT_REPO=https://github.com/OpenSim-NGC/OpenSim-Sasquatch.git -OS_GIT_BRANCH=develop -# OS_GIT_BRANCH=opensim-rel-0.9.3.8940 -# OS_GIT_BRANCH=opensim-rel-0.9.3.8984 +OS_GIT_REPO=https://github.com/OpenSim-NGC/OpenSim-Tranquillity.git +OS_GIT_BRANCH=master +# OS_GIT_BRANCH=opensim-rel-0.9.3.9037 OS_BUILDTARGET=Release OS_SLN=OpenSim.sln diff --git a/image-ngc/pushOpenSimImage.sh b/image-ngc/pushOpenSimImage.sh index 9d654d7..ba1a0ca 100755 --- a/image-ngc/pushOpenSimImage.sh +++ b/image-ngc/pushOpenSimImage.sh @@ -8,7 +8,10 @@ export IMAGE_OWNER=${IMAGE_OWNER:-misterblue} export IMAGE_NAME=${IMAGE_NAME:-opensim-ngc} export IMAGE_VERSION=${IMAGE_VERSION:-latest} -VERSIONLABEL=$(docker run --rm --entrypoint /home/opensim/getVersion.sh ${IMAGE_NAME}:${IMAGE_VERSION} OS_GIT_DESCRIBE) +# VERSIONLABEL=$(docker run --rm --entrypoint /home/opensim/getVersion.sh ${IMAGE_NAME}:${IMAGE_VERSION} OS_GIT_DESCRIBE) +OSVERSION=$(docker run --rm --entrypoint /home/opensim/getVersion.sh ${IMAGE_NAME}:${IMAGE_VERSION} OS_VERSION) +OSGITCOMMIT=$(docker run --rm --entrypoint /home/opensim/getVersion.sh ${IMAGE_NAME}:${IMAGE_VERSION} OS_GIT_COMMIT_SHORT) +VERSIONLABEL=${OSVERSION}-${OSGITCOMMIT} echo "Pushing docker image for opensim version ${VERSIONLABEL}"