From 0acb4fcc133056f9fb401b6e23d70f6ec895302a Mon Sep 17 00:00:00 2001 From: "Christopher Lott (cl778h)" Date: Mon, 2 Oct 2017 12:09:24 -0400 Subject: Update deliveries for portal deployment Use onap (not openecomp) in Nexus tag. Revise environment variables suitable for Rackspace via HEAT. Use registry nexus.onap.org:10001 instead of port 1003. Drop portal_vm_init.sh; moved back to ONAP demo repo. Issue: PORTAL-90 Change-Id: Ib51668eceff851db0271cd6acb2bdecf08cafa06 Signed-off-by: Christopher Lott (cl778h) --- deliveries/os_docker_base.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'deliveries/os_docker_base.sh') diff --git a/deliveries/os_docker_base.sh b/deliveries/os_docker_base.sh index 2bdfea68..70ed1b8b 100755 --- a/deliveries/os_docker_base.sh +++ b/deliveries/os_docker_base.sh @@ -20,13 +20,14 @@ source $(dirname $0)/.env # Build the containers ./build_portalapps_dockers.sh -APPS_VERSION="${NEXUS_REPO}/openecomp/${EP_IMG_NAME}:${VERSION}" -DB_VERSION="${NEXUS_REPO}/openecomp/${DB_IMG_NAME}:${VERSION}" -WMS_VERSION="${NEXUS_REPO}/openecomp/${WMS_IMG_NAME}:${VERSION}" +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_LATEST="${NEXUS_REPO}/openecomp/${EP_IMG_NAME}:${LATEST}" -DB_LATEST="${NEXUS_REPO}/openecomp/${DB_IMG_NAME}:${LATEST}" -WMS_LATEST="${NEXUS_REPO}/openecomp/${WMS_IMG_NAME}:${LATEST}" +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}" # tag versions docker tag ${EP_IMG_NAME}:${PORTAL_TAG} ${APPS_VERSION} @@ -38,7 +39,7 @@ docker tag ${DB_IMG_NAME}:${PORTAL_TAG} ${DB_LATEST} docker tag ${WMS_IMG_NAME}:${PORTAL_TAG} ${WMS_VERSION} docker tag ${WMS_IMG_NAME}:${PORTAL_TAG} ${WMS_LATEST} -# push +# push to registry docker push ${APPS_VERSION} docker push ${APPS_LATEST} -- cgit 1.2.3-korg