Code Review
/
ci-management.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Prepare repo for global-jjb v0.25.0
[ci-management.git]
/
jjb
/
shell
/
build-docker.sh
diff --git
a/jjb/shell/build-docker.sh
b/jjb/shell/build-docker.sh
index
53d4faf
..
7656d28
100644
(file)
--- a/
jjb/shell/build-docker.sh
+++ b/
jjb/shell/build-docker.sh
@@
-69,6
+69,12
@@
postgres_db_schema)
;;
esac
;;
esac
+# Append stream, if it is not the master stream
+if [ "${STREAM}" != "master" ]
+then
+ VERSION="${VERSION}-${STREAM}"
+fi
+
# Build and push the Docker container
docker build -f Dockerfile -t ${CON_NAME}:${VERSION} .
docker tag ${CON_NAME}:${VERSION} ${DOCKER_REPO}/${CON_NAME}:${VERSION}
# Build and push the Docker container
docker build -f Dockerfile -t ${CON_NAME}:${VERSION} .
docker tag ${CON_NAME}:${VERSION} ${DOCKER_REPO}/${CON_NAME}:${VERSION}