From 4ec03269604e3bd897207552127f94b4d1f30850 Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dtimoney@att.com>
Date: Thu, 12 Dec 2019 10:35:10 -0500
Subject: Update to use ONAP specific ODL distro

Updated CCSDK dockers to use ONAP-specific OpenDaylight Neon SR1
distribution.

Change-Id: I602ace48c00b78ac6e2b5e80a9403330790e3487
Issue-ID: CCSDK-1753
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
---
 opendaylight/neon/neon-docker/pom.xml              | 183 ---------------------
 .../neon/neon-docker/src/main/docker/Dockerfile    |  22 ---
 2 files changed, 205 deletions(-)
 delete mode 100644 opendaylight/neon/neon-docker/pom.xml
 delete mode 100644 opendaylight/neon/neon-docker/src/main/docker/Dockerfile

(limited to 'opendaylight/neon/neon-docker')

diff --git a/opendaylight/neon/neon-docker/pom.xml b/opendaylight/neon/neon-docker/pom.xml
deleted file mode 100644
index c8228eec..00000000
--- a/opendaylight/neon/neon-docker/pom.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.onap.ccsdk.distribution</groupId>
-		<artifactId>distribution-odl-neon</artifactId>
-		<version>0.7.0-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>distribution-odl-neon-docker</artifactId>
-	<version>0.7.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
-
-	<name>ccsdk-distribution :: opendaylight :: neon :: docker</name>
-	<description>Creates OpenDaylight container</description>
-	<organization>
-		<name>ONAP</name>
-	</organization>
-
-	<properties>
-		<image.name>onap/ccsdk-odl-neon-alpine-image</image.name>
-	</properties>
-	<build>
-		<plugins>
-
-
-			<plugin>
-				<groupId>org.codehaus.groovy.maven</groupId>
-				<artifactId>gmaven-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>validate</phase>
-						<goals>
-							<goal>execute</goal>
-						</goals>
-						<configuration>
-							<source>${basedir}/../../../src/main/scripts/TagVersion.groovy</source>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<version>3.0.0</version>
-				<executions>
-					<execution>
-						<id>get-odl-distribution</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>copy</goal>
-						</goals>
-						<configuration>
-							<artifactItems>
-								<artifactItem>
-									<groupId>org.opendaylight.integration</groupId>
-									<artifactId>karaf</artifactId>
-									<version>${ccsdk.opendaylight.version}</version>
-									<type>tar.gz</type>
-
-									<overWrite>true</overWrite>
-									<outputDirectory>${basedir}/target/docker-stage</outputDirectory>
-								</artifactItem>
-							</artifactItems>
-							<overWriteReleases>false</overWriteReleases>
-							<overWriteSnapshots>true</overWriteSnapshots>
-							<overWriteIfNewer>true</overWriteIfNewer>
-						</configuration>
-					</execution>
-
-					<execution>
-						<id>get-mariadb-connector-jar</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>copy</goal>
-						</goals>
-						<configuration>
-							<artifactItems>
-								<artifactItem>
-									<groupId>org.mariadb.jdbc</groupId>
-									<artifactId>mariadb-java-client</artifactId>
-									<version>${ccsdk.mariadb-connector-java.version}</version>
-									<type>jar</type>
-									<overWrite>true</overWrite>
-									<outputDirectory>${basedir}/target/docker-stage</outputDirectory>
-								</artifactItem>
-							</artifactItems>
-							<overWriteReleases>false</overWriteReleases>
-							<overWriteSnapshots>true</overWriteSnapshots>
-							<overWriteIfNewer>true</overWriteIfNewer>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.6</version>
-				<executions>
-					<execution>
-						<id>copy-dockerfile</id>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals><!-- here the phase you need -->
-						<phase>validate</phase>
-						<configuration>
-							<outputDirectory>${basedir}/target/docker-stage</outputDirectory>
-							<resources>
-								<resource>
-									<directory>src/main/docker</directory>
-									<includes>
-										<include>Dockerfile</include>
-									</includes>
-									<filtering>true</filtering>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-
-
-		</plugins>
-	</build>
-
-	<profiles>
-		<profile>
-			<id>docker</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>io.fabric8</groupId>
-						<artifactId>docker-maven-plugin</artifactId>
-						<version>0.28.0</version>
-						<inherited>false</inherited>
-						<configuration>
-							<images>
-								<image>
-									<name>${image.name}</name>
-									<build>
-										<cleanup>try</cleanup>
-										<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-										<dockerFile>Dockerfile</dockerFile>
-										<tags>
-											<tag>${project.docker.latestminortag.version}</tag>
-											<tag>${project.docker.latestfulltag.version}</tag>
-											<tag>${project.docker.latesttagtimestamp.version}</tag>
-										</tags>
-									</build>
-								</image>
-							</images>
-						</configuration>
-						<executions>
-							<execution>
-								<id>generate-images</id>
-								<phase>package</phase>
-								<goals>
-									<goal>build</goal>
-								</goals>
-							</execution>
-
-							<execution>
-								<id>push-images</id>
-								<phase>${docker.push.phase}</phase>
-								<goals>
-									<goal>build</goal>
-									<goal>push</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-
-				</plugins>
-			</build>
-		</profile>
-
-	</profiles>
-</project>
diff --git a/opendaylight/neon/neon-docker/src/main/docker/Dockerfile b/opendaylight/neon/neon-docker/src/main/docker/Dockerfile
deleted file mode 100644
index a043e1e9..00000000
--- a/opendaylight/neon/neon-docker/src/main/docker/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Base ubuntu with added packages needed for open ecomp
-FROM onap/ccsdk-alpine-image:${project.docker.latestfulltag.version}
-MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org)
-ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
-ENV ODL_HOME /opt/opendaylight/current
-
-# copy the opendaylight tar and expand
-COPY karaf-${ccsdk.opendaylight.version}.tar.gz /tmp/
-RUN mkdir -p /opt/odl \
-    && tar zxvf /tmp/karaf-${ccsdk.opendaylight.version}.tar.gz --directory /opt/odl \
-    && rm -rf /tmp/karaf-${ccsdk.opendaylight.version}.tar.gz \
-    && mv /opt/odl/karaf-${ccsdk.opendaylight.version} /opt/opendaylight \
-    && ln -s  /opt/opendaylight /opt/opendaylight/karaf-${ccsdk.opendaylight.version} \
-    && ln -s /opt/opendaylight /opt/opendaylight/current
- 
-
-# workaround till we get proxy working
-RUN mkdir -p /opt/opendaylight/system/org/mariadb/jdbc/mariadb-java-client/${ccsdk.mariadb-connector-java.version}
-COPY mariadb-java-client-${ccsdk.mariadb-connector-java.version}.jar /opt/opendaylight/system/org/mariadb/jdbc/mariadb-java-client/${ccsdk.mariadb-connector-java.version}
-
-# ENTRYPOINT exec /opt/opendaylight/bin/karaf
-EXPOSE 8181
-- 
cgit 1.2.3-korg