mirror of
https://github.com/Misterblue/opensim-docker.git
synced 2026-07-29 19:03:18 +00:00
opensim-ngc: default to building 'master' branch of NGC
opensim-ngc: follow rename of repository from "OpenSim-Sasquatch.git" to "OpenSim-Tranquility.git" opensim-ngc: change version tag of docker image to "OSVERSION-OSCOMMITSHORT" since OSGITCOMMIT is not very informative Bump version.
This commit is contained in:
+1
-1
@@ -1 +1 @@
|
||||
4.0.13
|
||||
4.0.14
|
||||
|
||||
+3
-4
@@ -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
|
||||
|
||||
|
||||
@@ -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}"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user