version 1.2.5

This commit is contained in:
Robert Adams
2019-12-20 11:12:16 -08:00
parent e03dfd73bf
commit 6000ffe6fb
4 changed files with 158 additions and 6 deletions
-2
View File
@@ -42,8 +42,6 @@ USER ${USER}:${USER}
RUN cd /home/${USER} \
&& git clone https://github.com/Misterblue/convoar.git \
&& git clone https://github.com/Herbal3d/HerbalCommonEntitiesCS.git \
&& cd convoar \
&& nuget restore convoar.sln \
&& msbuild /p:Configuration=${TARGET}
# Alternate Linux method that uses the precompiled binaries in the repository
+1 -1
View File
@@ -1 +1 @@
1.2.4
1.2.5
+4 -3
View File
@@ -16,13 +16,13 @@ VERSION=$(cat VERSION)
# Tag and create commit git sources with the version number.
# Not working yet... need to automate Visual Studio versioning.
DO_GIT_TAG=no
DO_GIT_TAG=yes
# Build the docker image of the latest git commited sources.
DO_DOCKER_BUILD=yes
# Push the built docker image to DockerHub.
DO_DOCKERHUB_PUSH=no
DO_DOCKERHUB_PUSH=yes
# Tag the version in git
if [[ "$DO_GIT_TAG" == "yes" ]] ; then
@@ -34,7 +34,8 @@ if [[ "$DO_GIT_TAG" == "yes" ]] ; then
fi
if [[ "$DO_DOCKER_BUILD" == "yes" ]] ; then
docker build --no-cache --build-arg VERSION=${VERSION} -t herbal3d/convoar .
# docker build --no-cache --build-arg VERSION=${VERSION} -t herbal3d/convoar .
docker build --build-arg VERSION=${VERSION} -t herbal3d/convoar .
docker tag $DOCKERHUB_USER/$IMAGE:latest $DOCKERHUB_USER/$IMAGE:$VERSION
fi
+153
View File
File diff suppressed because one or more lines are too long