|
|
@@ -27,8 +27,8 @@ PROJECT_DIR=$(cd ${0%/*}/..; pwd)
|
|
|
|
|
|
if [[ ! $DBE_TAG ]]; then
|
|
|
DBE_TAG=$(git describe --exact-match 2>/dev/null)
|
|
|
- # If the command failed or not on a tag then use ':master' by default
|
|
|
- if [[ $? -ne 0 ]]; then DBE_TAG=:master; fi
|
|
|
+ # If the command failed or not on a tag then use 'master' by default
|
|
|
+ if [[ $? -ne 0 ]]; then DBE_TAG=master; fi
|
|
|
fi
|
|
|
|
|
|
BuildEnvironment=-$1; shift
|
|
|
@@ -44,7 +44,7 @@ if [[ $(docker version -f {{.Client.Version}}) =~ ^([0-9]+)\.0*([0-9]+)\. ]] &&
|
|
|
--mount type=bind,source=$PROJECT_DIR,target=$PROJECT_DIR \
|
|
|
--mount source=$(id -u).urho3d_home_dir,target=/home/urho3d \
|
|
|
--name dockerized$BuildEnvironment \
|
|
|
- urho3d/dockerized$BuildEnvironment$DBE_TAG $@
|
|
|
+ urho3d/dockerized$BuildEnvironment:$DBE_TAG $@
|
|
|
else
|
|
|
# Fallback workaround on older Docker CLI version
|
|
|
docker run -it --rm -h fishtank \
|
|
|
@@ -53,7 +53,7 @@ else
|
|
|
--mount type=bind,source=$PROJECT_DIR,target=$PROJECT_DIR \
|
|
|
--mount source=$(id -u).urho3d_home_dir,target=/home/urho3d \
|
|
|
--name dockerized$BuildEnvironment \
|
|
|
- urho3d/dockerized$BuildEnvironment$DBE_TAG $@
|
|
|
+ urho3d/dockerized$BuildEnvironment:$DBE_TAG $@
|
|
|
fi
|
|
|
|
|
|
# vi: set ts=4 sw=4 expandtab:
|