diff options
| author |   Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-01-03 15:14:58 -0500 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-01-11 17:41:24 -0500 |
| commit | e7cfae5dc0eb888487c6988678bcc99b2dad04c1 (patch) | |
| tree | 239d9fd906c8df771cc7026b8a50818761c9c6ea /odlsli | |
| parent | df56c579a469fbf81efd164b8b77bcef46618aaa (diff) | |
Changes for Fluorine
Update docker container for ODL Fluorine
Change-Id: Ia595d5afb30b2ad53de547e3b5f89fd480a76a28
Issue-ID: CCSDK-870
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'odlsli')
| -rw-r--r-- | odlsli/odlsli-alpine/pom.xml | 9 | ||||
| -rw-r--r-- | odlsli/odlsli-alpine/src/main/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | odlsli/odlsli-ubuntu/pom.xml | 9 | ||||
| -rw-r--r-- | odlsli/odlsli-ubuntu/src/main/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | odlsli/pom.xml | 8 |
5 files changed, 16 insertions, 14 deletions
diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index 29ee8082..3c4e9836 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -5,22 +5,23 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.2.0</version> + <version>1.2.1-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-odlsli-alpine</artifactId> - <version>0.4.0-SNAPSHOT</version> + <version>0.4.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution :: odlsli-alpine</name> - <description>Creates SDN Controller Docker container</description> + <description>Creates Alpine-based ODLSLI Docker container</description> <organization> <name>openECOMP</name> </organization> <properties> + <base.image.name>onap/ccsdk-odl-fluorine-alpine-image</base.image.name> <image.name>onap/ccsdk-odlsli-alpine-image</image.name> <ccsdk.project.version>${project.version}</ccsdk.project.version> <ccsdk.features.version>${project.version}</ccsdk.features.version> @@ -31,7 +32,7 @@ <docker.verbose>true</docker.verbose> <ansible.gpg.key>93C4A3FD7BB9C367</ansible.gpg.key> </properties> - + <dependencies> <dependency> <groupId>${project.groupId}</groupId> diff --git a/odlsli/odlsli-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile index edd1f0f2..c6088b02 100644 --- a/odlsli/odlsli-alpine/src/main/docker/Dockerfile +++ b/odlsli/odlsli-alpine/src/main/docker/Dockerfile @@ -1,5 +1,5 @@ # Base ubuntu with added packages needed for open ecomp -FROM onap/ccsdk-odl-oxygen-alpine-image:${project.version} +FROM ${base.image.name}:${project.version} MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org) ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk ENV ODL_HOME /opt/opendaylight diff --git a/odlsli/odlsli-ubuntu/pom.xml b/odlsli/odlsli-ubuntu/pom.xml index b6c5d142..93d527b9 100644 --- a/odlsli/odlsli-ubuntu/pom.xml +++ b/odlsli/odlsli-ubuntu/pom.xml @@ -5,22 +5,23 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.2.0</version> + <version>1.2.1-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-odlsli-ubuntu</artifactId> - <version>0.4.0-SNAPSHOT</version> + <version>0.4.1-SNAPSHOT</version> <packaging>pom</packaging> - <name>ccsdk-distribution :: odlsli</name> - <description>Creates SDN Controller Docker container</description> + <name>ccsdk-distribution :: odlsli-ubuntu</name> + <description>Creates Ubuntu-based ODLSLI Docker container</description> <organization> <name>openECOMP</name> </organization> <properties> + <base.image.name>onap/ccsdk-odl-fluorine-ubuntu-image</base.image.name> <image.name>onap/ccsdk-odlsli-image</image.name> <ccsdk.project.version>${project.version}</ccsdk.project.version> <ccsdk.features.version>${project.version}</ccsdk.features.version> diff --git a/odlsli/odlsli-ubuntu/src/main/docker/Dockerfile b/odlsli/odlsli-ubuntu/src/main/docker/Dockerfile index 80cd95b2..455bdd79 100644 --- a/odlsli/odlsli-ubuntu/src/main/docker/Dockerfile +++ b/odlsli/odlsli-ubuntu/src/main/docker/Dockerfile @@ -1,5 +1,5 @@ # Base ubuntu with added packages needed for open ecomp -FROM onap/ccsdk-odl-oxygen-ubuntu-image:${project.version} +FROM ${base.image.name}:${project.version} MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org) ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 ENV ODL_HOME /opt/opendaylight diff --git a/odlsli/pom.xml b/odlsli/pom.xml index b4ebe1fe..89d3fc28 100644 --- a/odlsli/pom.xml +++ b/odlsli/pom.xml @@ -5,15 +5,15 @@ <parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-root</artifactId> - <version>0.4.0-SNAPSHOT</version> + <version>0.4.1-SNAPSHOT</version> </parent> <artifactId>distribution-odlsli</artifactId> - <version>0.4.0-SNAPSHOT</version> + <version>0.4.1-SNAPSHOT</version> <packaging>pom</packaging> - <name>ccsdk-distribution :: opendaylight</name> - <description>Creates OpenDaylight container</description> + <name>ccsdk-distribution :: odlsli</name> + <description>Creates ODLSLI containers</description> <modules> <module>odlsli-ubuntu</module> |