From e7cfae5dc0eb888487c6988678bcc99b2dad04c1 Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dtimoney@att.com>
Date: Thu, 3 Jan 2019 15:14:58 -0500
Subject: 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>
---
 odlsli/odlsli-alpine/pom.xml                    | 9 +++++----
 odlsli/odlsli-alpine/src/main/docker/Dockerfile | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'odlsli/odlsli-alpine')

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
-- 
cgit 1.2.3-korg