X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=deliveries%2Fos_docker_base.sh;h=94832ff53f2003cd8ea11e2f16a43321158c73a8;hb=83de9db899ebf7ec87220670d6f5cf35a10d087b;hp=70ed1b8b05e72bceda8de6beeee80f7fc8d2e098;hpb=0acb4fcc133056f9fb401b6e23d70f6ec895302a;p=portal.git diff --git a/deliveries/os_docker_base.sh b/deliveries/os_docker_base.sh index 70ed1b8b..94832ff5 100755 --- a/deliveries/os_docker_base.sh +++ b/deliveries/os_docker_base.sh @@ -14,24 +14,32 @@ 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 -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}" +# Establish environment variables +source $(dirname $0)/.env -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}" +APP_VERSION="${NEXUS_REPO}/${EP_IMG_NAME}:${VERSION}" +SDK_VERSION="${NEXUS_REPO}/${SDK_IMG_NAME}:${VERSION}" +DB_VERSION="${NEXUS_REPO}/${DB_IMG_NAME}:${VERSION}" +WMS_VERSION="${NEXUS_REPO}/${WMS_IMG_NAME}:${VERSION}" + +APP_LATEST="${NEXUS_REPO}/${EP_IMG_NAME}:${LATEST}" +SDK_LATEST="${NEXUS_REPO}/${SDK_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} -docker tag ${EP_IMG_NAME}:${PORTAL_TAG} ${APPS_LATEST} +docker tag ${EP_IMG_NAME}:${PORTAL_TAG} ${APP_VERSION} +docker tag ${EP_IMG_NAME}:${PORTAL_TAG} ${APP_LATEST} + +docker tag ${SDK_IMG_NAME}:${PORTAL_TAG} ${SDK_VERSION} +docker tag ${SDK_IMG_NAME}:${PORTAL_TAG} ${SDK_LATEST} docker tag ${DB_IMG_NAME}:${PORTAL_TAG} ${DB_VERSION} docker tag ${DB_IMG_NAME}:${PORTAL_TAG} ${DB_LATEST} @@ -40,8 +48,11 @@ docker tag ${WMS_IMG_NAME}:${PORTAL_TAG} ${WMS_VERSION} docker tag ${WMS_IMG_NAME}:${PORTAL_TAG} ${WMS_LATEST} # push to registry -docker push ${APPS_VERSION} -docker push ${APPS_LATEST} +docker push ${APP_VERSION} +docker push ${APP_LATEST} + +docker push ${SDK_VERSION} +docker push ${SDK_LATEST} docker push ${DB_VERSION} docker push ${DB_LATEST}