diff options
| author |   Christopher Lott (cl778h) <clott@research.att.com> | 2017-10-02 15:53:21 -0400 |
|---|---|---|
| committer | Christopher Lott (cl778h) <clott@research.att.com> | 2017-10-02 16:39:48 -0400 |
| commit | 89cce2a7c0f8becfaf4600b7a165b6168e51a94f (patch) | |
| tree | e7a1b290e542393e31de946015a2121e4b375ab7 | |
| parent | 0acb4fcc133056f9fb401b6e23d70f6ec895302a (diff) | |
Drop redundant "onap"; fix port
1. Remove extraneous "onap/".
2. Define Nexus registry in "push" script using port 10003;
the releases repo on port 10001 does not allow push.
Issue: PORTAL-90
Change-Id: I6eb41de36eefc531598cbc495712d55b9df4782a
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
| -rw-r--r-- | deliveries/.env | 3 | ||||
| -rwxr-xr-x | deliveries/os_docker_base.sh | 17 |
2 files changed, 10 insertions, 10 deletions
diff --git a/deliveries/.env b/deliveries/.env index 1e713aec..f5d1090c 100644 --- a/deliveries/.env +++ b/deliveries/.env @@ -1,9 +1,6 @@ # Environment settings # used by docker-compose AND by other shell scripts -# Source of images -NEXUS_REPO=nexus3.onap.org:10001 - # Following are ALSO used in demo/boot/portal_vm_init.sh EP_IMG_NAME=onap/portal-apps DB_IMG_NAME=onap/portal-db diff --git a/deliveries/os_docker_base.sh b/deliveries/os_docker_base.sh index 70ed1b8b..3f110003 100755 --- a/deliveries/os_docker_base.sh +++ b/deliveries/os_docker_base.sh @@ -14,20 +14,23 @@ if [ -z "$LATEST" ]; then 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 -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} |