fix issues with build-docker-image
- fix typo in --namespace option build-docker-image had a missing '$' in the code that handled the --namespace option. - force builds to kollaglue namespace with 'latest' tag to use the --release flag - build IMAGE after config and options processing to permit overriding PREFIX in .buildconf Change-Id: Icf70b33080ef19643f133f2b6f60087c524bd4fb
This commit is contained in:
parent
82536f830e
commit
cf9440005a
@ -1,11 +1,11 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
TOPDIR=$(git rev-parse --show-toplevel)
|
||||||
|
|
||||||
|
RELEASE_NAMESPACE=kollaglue
|
||||||
NAMESPACE=kollaglue
|
NAMESPACE=kollaglue
|
||||||
PREFIX=fedora-rdo-
|
PREFIX=fedora-rdo-
|
||||||
TAG=$(git rev-parse --short HEAD)
|
TAG=$(git rev-parse --short HEAD)
|
||||||
IMAGE="${PREFIX}${PWD##*/}"
|
|
||||||
|
|
||||||
TOPDIR=$(git rev-parse --show-toplevel)
|
|
||||||
|
|
||||||
usage () {
|
usage () {
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
@ -36,6 +36,7 @@ while :; do
|
|||||||
;;
|
;;
|
||||||
|
|
||||||
(--release) MODE=release
|
(--release) MODE=release
|
||||||
|
NAMESPACE=$RELEASE_NAMESPACE
|
||||||
TAG=latest
|
TAG=latest
|
||||||
;;
|
;;
|
||||||
|
|
||||||
@ -52,7 +53,7 @@ while :; do
|
|||||||
|
|
||||||
(--namespace|-n)
|
(--namespace|-n)
|
||||||
shift
|
shift
|
||||||
NAMESPACE="1"
|
NAMESPACE="$1"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
(--) break
|
(--) break
|
||||||
@ -63,6 +64,15 @@ while :; do
|
|||||||
shift
|
shift
|
||||||
done
|
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}}"
|
FULLIMAGE="${NAMESPACE}/${IMAGE}${TAG:+:${TAG}}"
|
||||||
|
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
|
Loading…
x
Reference in New Issue
Block a user