Code Review
/
portal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Drop redundant "onap"; fix port
[portal.git]
/
deliveries
/
os_docker_base.sh
diff --git
a/deliveries/os_docker_base.sh
b/deliveries/os_docker_base.sh
index
70ed1b8
..
3f11000
100755
(executable)
--- a/
deliveries/os_docker_base.sh
+++ b/
deliveries/os_docker_base.sh
@@
-14,20
+14,23
@@
if [ -z "$LATEST" ]; then
exit 1
fi
exit 1
fi
+# ONAP docker registry for pushing; may need to move
+# this into os_docker_push, os_docker_release scripts
+NEXUS_REPO=nexus3.onap.org:10003
+
# Establish environment variables
source $(dirname $0)/.env
# Build the containers
./build_portalapps_dockers.sh
# Establish environment variables
source $(dirname $0)/.env
# Build the containers
./build_portalapps_dockers.sh
-PREFIX=onap
-APPS_VERSION="${NEXUS_REPO}/${PREFIX}/${EP_IMG_NAME}:${VERSION}"
-DB_VERSION="${NEXUS_REPO}/${PREFIX}/${DB_IMG_NAME}:${VERSION}"
-WMS_VERSION="${NEXUS_REPO}/${PREFIX}/${WMS_IMG_NAME}:${VERSION}"
+APPS_VERSION="${NEXUS_REPO}/${EP_IMG_NAME}:${VERSION}"
+DB_VERSION="${NEXUS_REPO}/${DB_IMG_NAME}:${VERSION}"
+WMS_VERSION="${NEXUS_REPO}/${WMS_IMG_NAME}:${VERSION}"
-APPS_LATEST="${NEXUS_REPO}/${
PREFIX}/${
EP_IMG_NAME}:${LATEST}"
-DB_LATEST="${NEXUS_REPO}/${
PREFIX}/${
DB_IMG_NAME}:${LATEST}"
-WMS_LATEST="${NEXUS_REPO}/${
PREFIX}/${
WMS_IMG_NAME}:${LATEST}"
+APPS_LATEST="${NEXUS_REPO}/${EP_IMG_NAME}:${LATEST}"
+DB_LATEST="${NEXUS_REPO}/${DB_IMG_NAME}:${LATEST}"
+WMS_LATEST="${NEXUS_REPO}/${WMS_IMG_NAME}:${LATEST}"
# tag versions
docker tag ${EP_IMG_NAME}:${PORTAL_TAG} ${APPS_VERSION}
# tag versions
docker tag ${EP_IMG_NAME}:${PORTAL_TAG} ${APPS_VERSION}