Docker fixes

[portal.git] / deliveries / os_docker_base.sh

diff --git a/deliveries/os_docker_base.sh b/deliveries/os_docker_base.sh
index 2bdfea6..2c4a391 100755 (executable)
--- a/deliveries/os_docker_base.sh
+++ b/deliveries/os_docker_base.sh
@@ -14,19 +14,23 @@ if [ -z "$LATEST" ]; then
     exit 1
 fi
 
-# Establish environment variables
-source $(dirname $0)/.env
+# ONAP docker registry for pushing; may need to move
+# this into os_docker_push, os_docker_release scripts
+NEXUS_REPO=nexus3.onap.org:10003
 
 # 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}"
+# Establish environment variables
+source $(dirname $0)/.env
+
+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}/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}/${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}
@@ -38,7 +42,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}