From 1bd7bcb12869c2260c6e0cd74e010dceefbf1879 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Tue, 23 Oct 2018 16:23:03 -0400 Subject: Roll to initial Dublin snapshot Roll to initial Dublin snapshot Change-Id: Id36b1e41ae75a7c282a5db85b30abe3a7688aeb9 Issue-ID: SDNC-480 Signed-off-by: Timoney, Dan (dt5972) Fix CCSDK docker version Update CCSDK docker versions used to build SDNC docker containers. Change-Id: I9497c788cc48b401f24aeb9018060c6c0d5b4a0b Issue-ID: SDNC-486 Signed-off-by: Timoney, Dan (dt5972) Former-commit-id: c261e3f719abcbea0762162dc9244f951296c6a1 --- installation/admportal/pom.xml | 5 +++-- installation/admportal/src/main/docker/Dockerfile | 2 +- installation/ansible-server/pom.xml | 5 +++-- installation/ansible-server/src/main/docker/Dockerfile | 2 +- installation/dgbuilder/pom.xml | 2 +- installation/dmaap-listener/pom.xml | 5 +++-- installation/dmaap-listener/src/main/docker/Dockerfile | 2 +- installation/pom.xml | 4 ++-- installation/sdnc/pom.xml | 5 +++-- installation/sdnc/src/main/docker/Dockerfile | 2 +- installation/ueb-listener/pom.xml | 9 +++++---- installation/ueb-listener/src/main/docker/Dockerfile | 2 +- 12 files changed, 25 insertions(+), 20 deletions(-) (limited to 'installation') diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml index 5a8e3c68..7cd1f478 100644 --- a/installation/admportal/pom.xml +++ b/installation/admportal/pom.xml @@ -5,14 +5,14 @@ org.onap.ccsdk.parent odlparent-lite - 1.1.1 + 1.2.0-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation-admportal - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT sdnc-oam :: installation :: ${project.artifactId} Creates admportal Docker container @@ -20,6 +20,7 @@ onap/admportal-sdnc-image ${project.version} + 0.4-STAGING-latest yyyyMMdd'T'HHmmss'Z' diff --git a/installation/admportal/src/main/docker/Dockerfile b/installation/admportal/src/main/docker/Dockerfile index fadb8120..abaa056f 100644 --- a/installation/admportal/src/main/docker/Dockerfile +++ b/installation/admportal/src/main/docker/Dockerfile @@ -1,5 +1,5 @@ # Base ubuntu with added packages needed for open ecomp -FROM onap/ccsdk-ubuntu-image:${ccsdk.distribution.version} +FROM onap/ccsdk-ubuntu-image:${ccsdk.docker.version} MAINTAINER SDN-C Team (sdnc@lists.openecomp.org) # create link for pm2 diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml index b9e88cbe..0ec328ee 100644 --- a/installation/ansible-server/pom.xml +++ b/installation/ansible-server/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.1.1 + 1.2.0-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation-ansible-server - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT sdnc-oam :: installation :: ${project.artifactId} Creates ansible-server Docker container @@ -19,6 +19,7 @@ onap/sdnc-ansible-server-image ${project.version} + 0.4-STAGING-latest ${https_proxy} yyyyMMdd'T'HHmmss'Z' diff --git a/installation/ansible-server/src/main/docker/Dockerfile b/installation/ansible-server/src/main/docker/Dockerfile index ea9e61b7..0e59fba8 100644 --- a/installation/ansible-server/src/main/docker/Dockerfile +++ b/installation/ansible-server/src/main/docker/Dockerfile @@ -1,5 +1,5 @@ # Base ubuntu with added packages needed for open ecomp -FROM onap/ccsdk-ansible-server-image:${ccsdk.distribution.version} +FROM onap/ccsdk-ansible-server-image:${ccsdk.docker.version} LABEL maintainer="SDN-C Team (sdnc@lists.openecomp.org)" diff --git a/installation/dgbuilder/pom.xml b/installation/dgbuilder/pom.xml index c9e9d79e..6ddd1eb8 100644 --- a/installation/dgbuilder/pom.xml +++ b/installation/dgbuilder/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.1.1 + 1.2.0-SNAPSHOT 4.0.0 diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml index 09f6048e..7878df52 100644 --- a/installation/dmaap-listener/pom.xml +++ b/installation/dmaap-listener/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.1.1 + 1.2.0-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation-dmaap-listener - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT sdnc-oam :: installation :: ${project.artifactId} Creates dmaap-listener Docker container @@ -19,6 +19,7 @@ onap/sdnc-dmaap-listener-image ${project.version} + 0.4-STAGING-latest ${https_proxy} yyyyMMdd'T'HHmmss'Z' diff --git a/installation/dmaap-listener/src/main/docker/Dockerfile b/installation/dmaap-listener/src/main/docker/Dockerfile index 49a70e4f..28676fac 100644 --- a/installation/dmaap-listener/src/main/docker/Dockerfile +++ b/installation/dmaap-listener/src/main/docker/Dockerfile @@ -1,5 +1,5 @@ # Base ubuntu with added packages needed for open ecomp -FROM onap/ccsdk-ubuntu-image:${ccsdk.distribution.version} +FROM onap/ccsdk-ubuntu-image:${ccsdk.docker.version} MAINTAINER SDNC Team (onap-sdnc@lists.onap.org) ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties diff --git a/installation/pom.xml b/installation/pom.xml index 65ead6f2..383c6763 100644 --- a/installation/pom.xml +++ b/installation/pom.xml @@ -5,14 +5,14 @@ org.onap.ccsdk.parent odlparent-lite - 1.1.1 + 1.2.0-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT sdnc-oam :: installation Installs SDN-C on local file system diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index 82a98195..4202e538 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -5,14 +5,14 @@ org.onap.ccsdk.parent odlparent-lite - 1.1.1 + 1.2.0-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation-sdnc - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT sdnc-oam :: installation :: ${project.artifactId} Creates SDN Controller Docker container @@ -21,6 +21,7 @@ onap/sdnc-image ${project.version} 1.4.1 + 0.4-STAGING-latest ${https_proxy} deploy true diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile index 13a644e4..89e2aa01 100755 --- a/installation/sdnc/src/main/docker/Dockerfile +++ b/installation/sdnc/src/main/docker/Dockerfile @@ -1,5 +1,5 @@ # Base ubuntu with added packages needed for open ecomp -FROM onap/ccsdk-odlsli-image:${ccsdk.distribution.version} +FROM onap/ccsdk-odlsli-image:${ccsdk.docker.version} MAINTAINER SDN-C Team (sdnc@lists.onap.org) diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml index 2e6c76c0..5cd806a4 100644 --- a/installation/ueb-listener/pom.xml +++ b/installation/ueb-listener/pom.xml @@ -5,22 +5,23 @@ org.onap.ccsdk.parent odlparent-lite - 1.1.1 + 1.2.0-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation-ueb-listener - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT sdnc-oam :: installation :: ${project.artifactId} Creates ueb-listener Docker container onap/sdnc-ueb-listener-image - ${project.version} + ${project.version} + 0.4-STAGING-latest ${https_proxy} - deploy + deploy yyyyMMdd'T'HHmmss'Z' diff --git a/installation/ueb-listener/src/main/docker/Dockerfile b/installation/ueb-listener/src/main/docker/Dockerfile index 49a70e4f..28676fac 100644 --- a/installation/ueb-listener/src/main/docker/Dockerfile +++ b/installation/ueb-listener/src/main/docker/Dockerfile @@ -1,5 +1,5 @@ # Base ubuntu with added packages needed for open ecomp -FROM onap/ccsdk-ubuntu-image:${ccsdk.distribution.version} +FROM onap/ccsdk-ubuntu-image:${ccsdk.docker.version} MAINTAINER SDNC Team (onap-sdnc@lists.onap.org) ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties -- cgit 1.2.3-korg