aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-10-06 21:15:36 +0000
committerGerrit Code Review <review@openstack.org>2014-10-06 21:15:36 +0000
commit5c2aded4d7d9a1c61e42856c75f88cae5af621ab (patch)
tree7a444f21392194022412488960910844e3ab11bd
parenteb6643e68640108beaedb0191b4a2e1187cc53d3 (diff)
parentcf9440005a3ff067666e898a9b6b0d44a98a0516 (diff)
downloadkolla-5c2aded4d7d9a1c61e42856c75f88cae5af621ab.tar.gz
kolla-5c2aded4d7d9a1c61e42856c75f88cae5af621ab.zip
Merge "fix issues with build-docker-image"
-rwxr-xr-xtools/build-docker-image18
1 files changed, 14 insertions, 4 deletions
diff --git a/tools/build-docker-image b/tools/build-docker-image
index 66e534fa4..469c63207 100755
--- a/tools/build-docker-image
+++ b/tools/build-docker-image
@@ -1,11 +1,11 @@
#!/bin/bash
+TOPDIR=$(git rev-parse --show-toplevel)
+
+RELEASE_NAMESPACE=kollaglue
NAMESPACE=kollaglue
PREFIX=fedora-rdo-
TAG=$(git rev-parse --short HEAD)
-IMAGE="${PREFIX}${PWD##*/}"
-
-TOPDIR=$(git rev-parse --show-toplevel)
usage () {
cat <<EOF
@@ -36,6 +36,7 @@ while :; do
;;
(--release) MODE=release
+ NAMESPACE=$RELEASE_NAMESPACE
TAG=latest
;;
@@ -52,7 +53,7 @@ while :; do
(--namespace|-n)
shift
- NAMESPACE="1"
+ NAMESPACE="$1"
;;
(--) break
@@ -63,6 +64,15 @@ while :; do
shift
done
+if [ "$NAMESPACE" = "$RELEASE_NAMESPACE" ] \
+ && [ "$TAG" = "latest" ] \
+ && ! [ "$MODE" = "release" ]; then
+
+ echo "ERROR: use --release to build a release image" >&2
+ exit 1
+fi
+
+IMAGE="${PREFIX}${PWD##*/}"
FULLIMAGE="${NAMESPACE}/${IMAGE}${TAG:+:${TAG}}"
cat <<EOF