summaryrefslogtreecommitdiffstats
path: root/deliveries
diff options
context:
space:
mode:
authorChristopher Lott (cl778h) <clott@research.att.com>2017-09-28 11:18:14 -0400
committerChristopher Lott (cl778h) <clott@research.att.com>2017-09-28 11:27:51 -0400
commit51d83152697da4f2ef2242471ee43f36e6b64300 (patch)
tree0e4bae37088950b1ab724d6f237cd5437c7f8fee /deliveries
parent1b29c0944a7eba1c88cfd25c94e4dd7ed0f82dc7 (diff)
Update license; improve coverage; add docs dir
Update licenses to match approved text; add where missing. Improve code coverage with additional tests. Use OParent. Drop ecomp-portal-BE-common-test entirely; tests merged to ecomp-portal-BE-common. All code from LF repo branch master_dev_amsterdam_1_3_0 Issue: PORTAL-42, PORTAL-50, PORTAL-90, PORTAL-96 Change-Id: I09d98bbf072411d2efed6fb34f378f7cc8d049ad Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
Diffstat (limited to 'deliveries')
-rw-r--r--deliveries/.env2
-rw-r--r--deliveries/docker-compose.yml9
-rwxr-xr-xdeliveries/os_docker_push.sh2
-rwxr-xr-xdeliveries/os_docker_release.sh4
4 files changed, 8 insertions, 9 deletions
diff --git a/deliveries/.env b/deliveries/.env
index eb7f33ca..180ea1f1 100644
--- a/deliveries/.env
+++ b/deliveries/.env
@@ -13,6 +13,6 @@ DB_IMG_NAME=portal-db
WMS_IMG_NAME=portal-wms
# Tag all images with this
-PORTAL_TAG=1.1.0
+PORTAL_TAG=1.3.0
NEXUS_REPO=nexus3.onap.org:10003
diff --git a/deliveries/docker-compose.yml b/deliveries/docker-compose.yml
index 2b33c8ee..d32a4050 100644
--- a/deliveries/docker-compose.yml
+++ b/deliveries/docker-compose.yml
@@ -1,15 +1,14 @@
# docker-compose for ONAP portal containers: database, microservice, portal apps.
-# Only exposes the portal apps on host network, not the database or WMS.
-# Works in multiple environments; does not pull from a Nexus repository.
# Relies on .env file in current directory.
+# Works in multiple environments; does not pull from a Nexus registry.
+# Exposes the portal apps docker (but not DB nor WMS dockers) on the host network.
+# Images must be pulled from ONAP Nexus registry after logging in like this:
+# docker login -u USER -p PASS nexus3.onap.org:10001
version: '2.0'
services:
- # Available from ONAP Nexus repository:
- # docker login -u USER -p PASS nexus3.onap.org:10001
- # docker pull nexus3.onap.org:10001/onap/cli:1.1-STAGING-latest
cli:
image: onap/cli:${PORTAL_TAG}
environment:
diff --git a/deliveries/os_docker_push.sh b/deliveries/os_docker_push.sh
index eb663b83..30bd3dc7 100755
--- a/deliveries/os_docker_push.sh
+++ b/deliveries/os_docker_push.sh
@@ -5,7 +5,7 @@
set -x
TIMESTAMP=$(date +%C%y%m%dT%H%M%S)
-export VERSION="1.1.0-SNAPSHOT-${TIMESTAMP}"
+export VERSION="1.3.0-SNAPSHOT-${TIMESTAMP}"
export LATEST="latest"
exec ./os_docker_base.sh
diff --git a/deliveries/os_docker_release.sh b/deliveries/os_docker_release.sh
index 42825534..45a14507 100755
--- a/deliveries/os_docker_release.sh
+++ b/deliveries/os_docker_release.sh
@@ -5,7 +5,7 @@
set -x
TIMESTAMP=$(date +%C%y%m%dT%H%M%S)
-export VERSION="1.1.0-STAGING-${TIMESTAMP}"
-export LATEST="1.1-STAGING-latest"
+export VERSION="1.3.0-STAGING-${TIMESTAMP}"
+export LATEST="1.3-STAGING-latest"
exec ./os_docker_base.sh