diff options
| author |   Pamela Dragosh <pdragosh@research.att.com> | 2017-02-23 10:37:49 -0500 |
|---|---|---|
| committer | Pamela Dragosh <pdragosh@research.att.com> | 2017-02-23 11:18:20 -0500 |
| commit | 6f91e0ba8db761cc8ae95c8284091d4fef5e2b48 (patch) | |
| tree | 57683f66b26beaeda94274dddab68a36c71af744 | |
| parent | e638c62f002a339536a6a76515ed8a238b135d90 (diff) | |
cleaning up - better verify/merge
Change-Id: Ief6428eefa6faed69236c9c481e500a0e7948e0b
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
| -rw-r--r-- | docker-compose.yml | 14 | ||||
| -rwxr-xr-x[-rw-r--r--] | docker_build.sh | 3 | ||||
| -rwxr-xr-x | docker_merge.sh | 20 | ||||
| -rwxr-xr-x[-rw-r--r--] | docker_verify.sh | 14 | ||||
| -rw-r--r-- | pom.xml | 12 |
5 files changed, 43 insertions, 20 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 791f0589..67719d9d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,17 +1,17 @@ version: '2' services: mariadb: - image: nexus3.openecomp.org:10001/openecomp/policy/policy-db + image: ${DOCKER_REPOSITORY}/openecomp/policy/policy-db container_name: mariadb hostname: mariadb ports: - "3306:3306" nexus: - image: nexus3.openecomp.org:10001/openecomp/policy/policy-nexus + image: ${DOCKER_REPOSITORY}/openecomp/policy/policy-nexus container_name: nexus hostname: nexus pap: - image: nexus3.openecomp.org:10001/openecomp/policy/policy-pe + image: ${DOCKER_REPOSITORY}/openecomp/policy/policy-pe container_name: pap depends_on: - mariadb @@ -23,7 +23,7 @@ services: volumes: - ./config/pe:/tmp/policy-install/config pdp: - image: nexus3.openecomp.org:10001/openecomp/policy/policy-pe + image: ${DOCKER_REPOSITORY}/openecomp/policy/policy-pe container_name: pdp depends_on: - pap @@ -34,7 +34,7 @@ services: volumes: - ./config/pe:/tmp/policy-install/config pypdp: - image: nexus3.openecomp.org:10001/openecomp/policy/policy-pe + image: ${DOCKER_REPOSITORY}/openecomp/policy/policy-pe container_name: pypdp depends_on: - pap @@ -45,7 +45,7 @@ services: volumes: - ./config/pe:/tmp/policy-install/config brmsgw: - image: nexus3.openecomp.org:10001/openecomp/policy/policy-pe + image: ${DOCKER_REPOSITORY}/openecomp/policy/policy-pe container_name: brmsgw depends_on: - pap @@ -54,7 +54,7 @@ services: volumes: - ./config/pe:/tmp/policy-install/config drools: - image: nexus3.openecomp.org:10001/openecomp/policy/policy-drools + image: ${DOCKER_REPOSITORY}/openecomp/policy/policy-drools container_name: drools depends_on: - mariadb diff --git a/docker_build.sh b/docker_build.sh index 001a2c0d..b21a6955 100644..100755 --- a/docker_build.sh +++ b/docker_build.sh @@ -6,6 +6,9 @@ echo '============== STARTING SCRIPT TO BUILD DOCKER IMAGES =================' DOCKER_REPOSITORY=nexus3.openecomp.org:10003 DOCKER_VERSION=latest +export DOCKER_REPOSITORY +export DOCKER_VERSION + cp policy-pe/* target/policy-pe/ cp policy-drools/* target/policy-drools/ diff --git a/docker_merge.sh b/docker_merge.sh new file mode 100755 index 00000000..65019782 --- /dev/null +++ b/docker_merge.sh @@ -0,0 +1,20 @@ +#!/bin/bash +# +echo '============== STARTING SCRIPT TO BUILD DOCKER IMAGES =================' + +DOCKER_REPOSITORY=nexus3.openecomp.org:10003 +DOCKER_VERSION=latest + +export DOCKER_REPOSITORY +export DOCKER_VERSION + +cp policy-pe/* target/policy-pe/ +cp policy-drools/* target/policy-drools/ + +for image in policy-os policy-nexus policy-db policy-base policy-drools policy-pe ; do + echo "Building $image" + mkdir -p target/$image + cp $image/* target/$image + docker build --quiet --tag openecomp/policy/$image:${DOCKER_VERSION} --tag ${DOCKER_REPOSITORY}/openecomp/policy/$image:${DOCKER_VERSION} target/$image + docker images +done diff --git a/docker_verify.sh b/docker_verify.sh index 8cbfe993..65019782 100644..100755 --- a/docker_verify.sh +++ b/docker_verify.sh @@ -2,7 +2,19 @@ # echo '============== STARTING SCRIPT TO BUILD DOCKER IMAGES =================' - DOCKER_REPOSITORY=nexus3.openecomp.org:10003 DOCKER_VERSION=latest +export DOCKER_REPOSITORY +export DOCKER_VERSION + +cp policy-pe/* target/policy-pe/ +cp policy-drools/* target/policy-drools/ + +for image in policy-os policy-nexus policy-db policy-base policy-drools policy-pe ; do + echo "Building $image" + mkdir -p target/$image + cp $image/* target/$image + docker build --quiet --tag openecomp/policy/$image:${DOCKER_VERSION} --tag ${DOCKER_REPOSITORY}/openecomp/policy/$image:${DOCKER_VERSION} target/$image + docker images +done @@ -36,18 +36,6 @@ </properties> <repositories> -<!-- - <repository> - <id>central</id> - <name>Maven 2 repository</name> - <url>http://repo2.maven.org/maven2/</url> - </repository> - <repository> - <id>soapUI</id> - <url>http://www.soapui.org/repository/maven2/</url> - <name>SoapUI plugin</name> - </repository> ---> <repository> <id>ecomp-releases</id> <name>OpenECOMP Release Repository</name> |