no hardcode nexus

Change-Id: I72f0c02e7d3b8a72502efa5e383b8e44c28d516b
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

diff --git a/docker-compose.yml b/docker-compose.yml
index f4e7321..8dd2325 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,23 +1,17 @@
 version: '2'
 services:
    mariadb:
-      image: ecomp-nexus:51220/policy/policy-db
-#      build:
-#         context: ./policy-db
+      image: openecomp/policy/policy-db
       container_name: mariadb
       hostname: mariadb
       ports:
        - "3306:3306"
    nexus:
-      image: ecomp-nexus:51220/policy/policy-nexus
-#      build:
-#         context: ./policy-nexus
+      image: openecomp/policy/policy-nexus
       container_name: nexus
       hostname: nexus
    pap:
-      image: ecomp-nexus:51220/policy/policy-pe
-#      build:
-#         context: ./policy-pe
+      image: openecomp/policy/policy-pe
       container_name: pap
       depends_on: 
        - mariadb
@@ -29,9 +23,7 @@ services:
       volumes:
        - ./config/pe:/tmp/policy-install/config
    pdp:
-      image: ecomp-nexus:51220/policy/policy-pe
-#      build:
-#         context: ./policy-pe
+      image: openecomp/policy/policy-pe
       container_name: pdp
       depends_on: 
        - pap
@@ -42,9 +34,7 @@ services:
       volumes:
        - ./config/pe:/tmp/policy-install/config
    pypdp:
-      image: ecomp-nexus:51220/policy/policy-pe
-#      build:
-#         context: ./policy-pe
+      image: openecomp/policy/policy-pe
       container_name: pypdp
       depends_on: 
        - pap
@@ -55,9 +45,7 @@ services:
       volumes:
        - ./config/pe:/tmp/policy-install/config
    brmsgw:
-      image: ecomp-nexus:51220/policy/policy-pe
-#      build:
-#         context: ./policy-pe
+      image: openecomp/policy/policy-pe
       container_name: brmsgw
       depends_on: 
        - pap
@@ -66,9 +54,7 @@ services:
       volumes:
        - ./config/pe:/tmp/policy-install/config
    drools:
-      image: ecomp-nexus:51220/policy/policy-drools
-#      build:
-#         context: ./policy-drools
+      image: openecomp/policy/policy-drools
       container_name: drools
       depends_on: 
        - mariadb

diff --git a/policy-base/Dockerfile b/policy-base/Dockerfile
index 943d336..2d46aba 100644 (file)
--- a/policy-base/Dockerfile
+++ b/policy-base/Dockerfile
@@ -1,4 +1,4 @@
-FROM ecomp-nexus:51220/policy/policy-os
+FROM openecomp/policy/policy-os
 
 
 # install MariaDB client

diff --git a/policy-db/Dockerfile b/policy-db/Dockerfile
index 3f8ed0b..a74164d 100644 (file)
--- a/policy-db/Dockerfile
+++ b/policy-db/Dockerfile
@@ -1,4 +1,4 @@
-FROM ecomp-nexus:51220/policy/policy-os
+FROM openecomp/policy/policy-os
 
 RUN \
        apt-get install -y apt-transport-https && \

diff --git a/policy-drools/Dockerfile b/policy-drools/Dockerfile
index 40d8809..920920e 100644 (file)
--- a/policy-drools/Dockerfile
+++ b/policy-drools/Dockerfile
@@ -1,4 +1,4 @@
-FROM ecomp-nexus:51220/policy/policy-base
+FROM openecomp/policy/policy-base
 
 RUN mkdir -p /opt/app/policy /tmp/policy-install && chown policy /opt/app/policy /tmp/policy-install
 WORKDIR /tmp/policy-install

diff --git a/policy-nexus/Dockerfile b/policy-nexus/Dockerfile
index 68ee917..6bfd01d 100644 (file)
--- a/policy-nexus/Dockerfile
+++ b/policy-nexus/Dockerfile
@@ -1,4 +1,4 @@
-FROM ecomp-nexus:51220/policy/policy-os
+FROM openecomp/policy/policy-os
 
 
 # note that in following command sequence, wget exit status is 1 even on success,

diff --git a/policy-pe/Dockerfile b/policy-pe/Dockerfile
index cce1de1..2f881b9 100644 (file)
--- a/policy-pe/Dockerfile
+++ b/policy-pe/Dockerfile
@@ -1,4 +1,4 @@
-FROM ecomp-nexus:51220/policy/policy-base
+FROM openecomp/policy/policy-base
 
 RUN mkdir -p /opt/app/policy /tmp/policy-install && chown policy /opt/app/policy /tmp/policy-install
 

diff --git a/pom.xml b/pom.xml
index 2888664..ba0904e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -31,6 +31,10 @@
        <name>Docker build</name>
        <description>OpenECOMP Policy Docker Build</description>
 
+       <properties>
+               <nexusproxy>https://nexus.openecomp.org</nexusproxy>
+       </properties>
+
        <repositories>
                <repository>
                        <id>central</id>