diff options
author | 2018-10-23 16:23:03 -0400 | |
---|---|---|
committer | 2018-10-25 09:35:34 -0400 | |
commit | 1bd7bcb12869c2260c6e0cd74e010dceefbf1879 (patch) | |
tree | 96df595f706bca416befdc2bbee86443d71bf009 /installation/dmaap-listener | |
parent | 9310f04aab4fe7ec87d634f9e223559888b2ca0d (diff) |
Roll to initial Dublin snapshot
Roll to initial Dublin snapshot
Change-Id: Id36b1e41ae75a7c282a5db85b30abe3a7688aeb9
Issue-ID: SDNC-480
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
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) <dtimoney@att.com>
Former-commit-id: c261e3f719abcbea0762162dc9244f951296c6a1
Diffstat (limited to 'installation/dmaap-listener')
-rw-r--r-- | installation/dmaap-listener/pom.xml | 5 | ||||
-rw-r--r-- | installation/dmaap-listener/src/main/docker/Dockerfile | 2 |
2 files changed, 4 insertions, 3 deletions
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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.1.1</version> + <version>1.2.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> <groupId>org.onap.sdnc.oam</groupId> <artifactId>installation-dmaap-listener</artifactId> - <version>1.4.1-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <name>sdnc-oam :: installation :: ${project.artifactId}</name> <description>Creates dmaap-listener Docker container</description> @@ -19,6 +19,7 @@ <properties> <image.name>onap/sdnc-dmaap-listener-image</image.name> <sdnc.project.version>${project.version}</sdnc.project.version> + <ccsdk.docker.version>0.4-STAGING-latest</ccsdk.docker.version> <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> </properties> 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 |