diff options
| author |   Timoney, Dan (dt5972) <dt5972@att.com> | 2018-06-18 23:01:08 -0400 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dt5972@att.com> | 2018-06-18 23:01:08 -0400 |
| commit | 6f0c0101dcb421c75a1a49bea02d1dc7479ef7d1 (patch) | |
| tree | 69f0b1ffabdb2283aa4a4707ab6e45b95dc7d6a4 /odlsli | |
| parent | 056e82aa242f7df59c72dc967f38d479c51f7509 (diff) | |
Update odlsli for ODL Oxygen
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>
Diffstat (limited to 'odlsli')
| -rw-r--r-- | odlsli/pom.xml | 3 | ||||
| -rw-r--r-- | odlsli/src/main/docker/Dockerfile | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/odlsli/pom.xml b/odlsli/pom.xml index 89054955..7a63ca23 100644 --- a/odlsli/pom.xml +++ b/odlsli/pom.xml @@ -26,6 +26,7 @@ <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> @@ -400,7 +401,7 @@ <execution> <id>push-images</id> - <phase>deploy</phase> + <phase>${docker.push.phase}</phase> <goals> <goal>build</goal> <goal>push</goal> diff --git a/odlsli/src/main/docker/Dockerfile b/odlsli/src/main/docker/Dockerfile index a31fcff4..f6aeda6d 100644 --- a/odlsli/src/main/docker/Dockerfile +++ b/odlsli/src/main/docker/Dockerfile @@ -1,5 +1,5 @@ # 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 |