Update odlsli to use ODL Oxygen as base container and to support local
docker builds for testing.
Change-Id: Ie615896e56177bf4b239ec080f09c50d8c16c0c5
Issue-ID: CCSDK-285
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
<ccsdk.project.version>${project.version}</ccsdk.project.version>
<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
<ccsdk.project.version>${project.version}</ccsdk.project.version>
<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+ <docker.push.phase>deploy</docker.push.phase>
</properties>
<dependencies>
</properties>
<dependencies>
<execution>
<id>push-images</id>
<execution>
<id>push-images</id>
+ <phase>${docker.push.phase}</phase>
<goals>
<goal>build</goal>
<goal>push</goal>
<goals>
<goal>build</goal>
<goal>push</goal>
# Base ubuntu with added packages needed for open ecomp
# Base ubuntu with added packages needed for open ecomp
-FROM onap/ccsdk-odl-image:${project.version}
+FROM onap/ccsdk-odl-oxygen-image:${project.version}
MAINTAINER CCSDK Team (onap-ccsdk@lists.openecomp.org)
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
ENV ODL_HOME /opt/opendaylight/current
MAINTAINER CCSDK Team (onap-ccsdk@lists.openecomp.org)
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
ENV ODL_HOME /opt/opendaylight/current
</organization>
<properties>
</organization>
<properties>
- <image.name>onap/ccsdk-odl-image</image.name>
+ <image.name>onap/ccsdk-odl-nitrogen-image</image.name>
<ccsdk.project.version>${project.version}</ccsdk.project.version>
<ccsdk.opendaylight.version>0.7.1</ccsdk.opendaylight.version>
<ccsdk.mariadb-connector-java.version>2.1.1</ccsdk.mariadb-connector-java.version>
<ccsdk.project.version>${project.version}</ccsdk.project.version>
<ccsdk.opendaylight.version>0.7.1</ccsdk.opendaylight.version>
<ccsdk.mariadb-connector-java.version>2.1.1</ccsdk.mariadb-connector-java.version>
<ccsdk.opendaylight.version>0.8.1</ccsdk.opendaylight.version>
<ccsdk.mariadb-connector-java.version>2.1.1</ccsdk.mariadb-connector-java.version>
<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
<ccsdk.opendaylight.version>0.8.1</ccsdk.opendaylight.version>
<ccsdk.mariadb-connector-java.version>2.1.1</ccsdk.mariadb-connector-java.version>
<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
+ <docker.push.phase>deploy</docker.push.phase>
</properties>
<dependencyManagement>
</properties>
<dependencyManagement>
<execution>
<id>push-images</id>
<execution>
<id>push-images</id>
+ <phase>${docker.push.phase}</phase>
<goals>
<goal>build</goal>
<goal>push</goal>
<goals>
<goal>build</goal>
<goal>push</goal>
<description>Creates OpenDaylight container</description>
<modules>
<description>Creates OpenDaylight container</description>
<modules>
- <module>nitrogen</module>
<module>oxygen</module>
</modules>
</project>
<module>oxygen</module>
</modules>
</project>