From 95ed460ebc52baeaf51677b4f210b69ef84e3ff4 Mon Sep 17 00:00:00 2001 From: Pamela Dragosh Date: Mon, 20 Feb 2017 10:37:15 -0500 Subject: no hardcode nexus Change-Id: I72f0c02e7d3b8a72502efa5e383b8e44c28d516b Signed-off-by: Pamela Dragosh --- docker-compose.yml | 28 +++++++--------------------- policy-base/Dockerfile | 2 +- policy-db/Dockerfile | 2 +- policy-drools/Dockerfile | 2 +- policy-nexus/Dockerfile | 2 +- policy-pe/Dockerfile | 2 +- pom.xml | 4 ++++ 7 files changed, 16 insertions(+), 26 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index f4e73213..8dd23257 100644 --- 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 943d3362..2d46aba8 100644 --- 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 3f8ed0b7..a74164dd 100644 --- 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 40d8809d..920920e7 100644 --- 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 68ee9178..6bfd01d7 100644 --- 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 cce1de1b..2f881b98 100644 --- 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 2888664f..ba0904e9 100644 --- a/pom.xml +++ b/pom.xml @@ -31,6 +31,10 @@ Docker build OpenECOMP Policy Docker Build + + https://nexus.openecomp.org + + central -- cgit 1.2.3-korg