Create base Chlorine docker image

Create base docker image for ODL Chlorine release. Also, remove
code to create Phosphorus docker image, which is not needed
in London ONAP release.

Issue-ID: CCSDK-3829
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I026f68bebfd3063d0ecb69c7b9cd7bf3e3a79d13

diff --git a/opendaylight/phosphorus/phosphorus-alpine/pom.xml b/opendaylight/chlorine/chlorine-alpine/pom.xml
similarity index 60%
rename from opendaylight/phosphorus/phosphorus-alpine/pom.xml
rename to opendaylight/chlorine/chlorine-alpine/pom.xml
index 55d3566..b490fcd 100644 (file)
--- a/opendaylight/phosphorus/phosphorus-alpine/pom.xml
+++ b/opendaylight/chlorine/chlorine-alpine/pom.xml
@@ -4,28 +4,23 @@
 
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
-        <artifactId>distribution-odl-phosphorus</artifactId>
+        <artifactId>distribution-odl-chlorine</artifactId>
         <version>1.5.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>distribution-odl-phosphorus-docker</artifactId>
+    <artifactId>distribution-odl-chlorine-docker</artifactId>
     <packaging>pom</packaging>
 
-    <name>ccsdk-distribution :: opendaylight :: phosphorus :: docker</name>
+    <name>ccsdk-distribution :: opendaylight :: chlorine :: docker</name>
     <description>Creates OpenDaylight container</description>
     <organization>
         <name>ONAP</name>
     </organization>
 
     <properties>
-        <image.name>onap/ccsdk-odl-phosphorus-alpine-image</image.name>
+        <image.name>onap/ccsdk-odl-chlorine-alpine-image</image.name>
         <odl.karaf.artifactId>onap-karaf</odl.karaf.artifactId>
-        <odl.shiro.version>0.14.7</odl.shiro.version>
-        <odl.netconf.version>2.0.11</odl.netconf.version>
-        <odl.ops4j.version>7.3.19</odl.ops4j.version>
-        <odl.pax.logging.version>2.0.10</odl.pax.logging.version>
-        <patch.pax.logging.version>2.0.14</patch.pax.logging.version>
-        <odl.karaf.framework.version>4.3.3</odl.karaf.framework.version>
+        <odl.shiro.version>0.15.5</odl.shiro.version>
     </properties>
 
     <build>
@@ -91,46 +86,6 @@
                                     <destFileName>aaa-authn-api-${odl.shiro.version}.jar</destFileName>
                                     <excludes>*</excludes>
                                 </artifactItem>
-                                <artifactItem>
-                                    <groupId>com.highstreet-technologies.ops4j.pax.web</groupId>
-                                    <artifactId>pax-web-jetty</artifactId>
-                                    <version>${odl.ops4j.version}</version>
-                                    <outputDirectory>${project.build.directory}/docker-stage/system/org/ops4j/pax/web/pax-web-jetty/${odl.ops4j.version}</outputDirectory>
-                                    <destFileName>pax-web-jetty-${odl.ops4j.version}.jar</destFileName>
-                                    <excludes>*</excludes>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>com.highstreet-technologies.netconf</groupId>
-                                    <artifactId>sal-netconf-connector</artifactId>
-                                    <version>${odl.netconf.version}</version>
-                                    <outputDirectory>${project.build.directory}/docker-stage/system/org/opendaylight/netconf/sal-netconf-connector/${odl.netconf.version}</outputDirectory>
-                                    <destFileName>sal-netconf-connector-${odl.netconf.version}.jar</destFileName>
-                                    <excludes>*</excludes>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.ops4j.pax.logging</groupId>
-                                    <artifactId>pax-logging-log4j2</artifactId>
-                                    <version>${patch.pax.logging.version}</version>
-                                    <outputDirectory>${project.build.directory}/docker-stage/system/org/ops4j/pax/logging/pax-logging-log4j2/${patch.pax.logging.version}</outputDirectory>
-                                    <destFileName>pax-logging-log4j2-${patch.pax.logging.version}.jar</destFileName>
-                                    <excludes>*</excludes>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.ops4j.pax.logging</groupId>
-                                    <artifactId>pax-logging-logback</artifactId>
-                                    <version>${patch.pax.logging.version}</version>
-                                    <outputDirectory>${project.build.directory}/docker-stage/system/org/ops4j/pax/logging/pax-logging-logback/${patch.pax.logging.version}</outputDirectory>
-                                    <destFileName>pax-logging-logback-${patch.pax.logging.version}.jar</destFileName>
-                                    <excludes>*</excludes>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.ops4j.pax.logging</groupId>
-                                    <artifactId>pax-logging-api</artifactId>
-                                    <version>${patch.pax.logging.version}</version>
-                                    <outputDirectory>${project.build.directory}/docker-stage/system/org/ops4j/pax/logging/pax-logging-api/${patch.pax.logging.version}</outputDirectory>
-                                    <destFileName>pax-logging-api-${patch.pax.logging.version}.jar</destFileName>
-                                    <excludes>*</excludes>
-                                </artifactItem>
                             </artifactItems>
                             <overWriteReleases>false</overWriteReleases>
                             <overWriteSnapshots>true</overWriteSnapshots>
@@ -170,26 +125,6 @@
                             </resources>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>copy-karaf-framework-features</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/resources</directory>
-                                    <includes>
-                                        <include>framework-${odl.karaf.framework.version}-features.xml</include>
-                                        <include>startup.properties</include>
-                                    </includes>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
 

diff --git a/opendaylight/phosphorus/phosphorus-alpine/src/main/docker/Dockerfile b/opendaylight/chlorine/chlorine-alpine/src/main/docker/Dockerfile
similarity index 76%
rename from opendaylight/phosphorus/phosphorus-alpine/src/main/docker/Dockerfile
rename to opendaylight/chlorine/chlorine-alpine/src/main/docker/Dockerfile
index 19cd55f..15b17d8 100644 (file)
--- a/opendaylight/phosphorus/phosphorus-alpine/src/main/docker/Dockerfile
+++ b/opendaylight/chlorine/chlorine-alpine/src/main/docker/Dockerfile
@@ -28,13 +28,6 @@ COPY system $ODL_HOME/system
 #RUN chmod 755 $ODL_HOME/bin/configure_cluster.sh $ODL_HOME/bin/configure-cluster-ipdetect.sh $ODL_HOME/bin/set_persistence.sh $ODL_HOME/bin/custom_shard_config.txt
 
 
-# Remove vulnerable version of ops4j logging
-COPY framework-${odl.karaf.framework.version}-features.xml $ODL_HOME/system/org/apache/karaf/features/framework/${odl.karaf.framework.version}/framework-${odl.karaf.framework.version}-features.xml
-COPY startup.properties $ODL_HOME/etc/startup.properties
-RUN rm -rf $ODL_HOME/system/org/ops4j/pax/logging/pax-logging-log4j2/${odl.pax.logging.version}
-RUN rm -rf $ODL_HOME/system/org/ops4j/pax/logging/pax-logging-logback/${odl.pax.logging.version}
-RUN rm -rf $ODL_HOME/system/org/ops4j/pax/logging/pax-logging-api/${odl.pax.logging.version}
-
 # Changing ownership and permission of /opt
 RUN chown -R odl:odl /opt && chmod -R 755 /opt
 

diff --git a/opendaylight/phosphorus/pom.xml b/opendaylight/chlorine/pom.xml
similarity index 81%
rename from opendaylight/phosphorus/pom.xml
rename to opendaylight/chlorine/pom.xml
index abef7ff..0378b16 100644 (file)
--- a/opendaylight/phosphorus/pom.xml
+++ b/opendaylight/chlorine/pom.xml
@@ -8,18 +8,18 @@
         <version>1.5.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>distribution-odl-phosphorus</artifactId>
+    <artifactId>distribution-odl-chlorine</artifactId>
     <packaging>pom</packaging>
 
-    <name>ccsdk-distribution :: opendaylight :: phosphorus</name>
+    <name>ccsdk-distribution :: opendaylight :: chlorine</name>
     <description>Creates OpenDaylight container</description>
 
     <modules>
-        <module>phosphorus-alpine</module>
+        <module>chlorine-alpine</module>
     </modules>
 
     <properties>
-        <ccsdk.opendaylight.version>0.15.1</ccsdk.opendaylight.version>
+        <ccsdk.opendaylight.version>0.17.1</ccsdk.opendaylight.version>
     </properties>
 
     <dependencyManagement>

diff --git a/opendaylight/phosphorus/phosphorus-alpine/src/main/resources/framework-4.3.3-features.xml b/opendaylight/phosphorus/phosphorus-alpine/src/main/resources/framework-4.3.3-features.xml
deleted file mode 100644 (file)
index 6f2ad09..0000000
--- a/opendaylight/phosphorus/phosphorus-alpine/src/main/resources/framework-4.3.3-features.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
-      Licensed to the Apache Software Foundation (ASF) under one or more
-      contributor license agreements.  See the NOTICE file distributed with
-      this work for additional information regarding copyright ownership.
-      The ASF licenses this file to You under the Apache License, Version 2.0
-      (the "License"); you may not use this file except in compliance with
-      the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
--->
-<features name="framework-4.3.3" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0">
-
-    <!-- This file is not used in the assembly., This file is used by the karaf-maven-plugin to generate a "final" feature.xml
-              including the correct start-level for the generation of the startup.propertie file -->
-
-    <feature version="4.3.3" description="Karaf core feature" name="framework" hidden="true">
-        <!-- persistent wiring extension -->
-        <bundle start-level="1">mvn:org.apache.karaf.features/org.apache.karaf.features.extension/4.3.3</bundle>
-        <!-- mvn: url handlers -->
-        <bundle start-level="5">mvn:org.ops4j.pax.url/pax-url-aether/2.6.7</bundle>
-        <!-- logging -->
-        <bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/${patch.pax.logging.version}</bundle>
-        <bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-log4j2/${patch.pax.logging.version}</bundle>
-        <bundle start-level="8">mvn:org.fusesource.jansi/jansi/1.18</bundle>
-        <!-- config admin -->
-        <bundle start-level="9">mvn:org.osgi/org.osgi.util.function/1.1.0</bundle>
-        <bundle start-level="9">mvn:org.osgi/org.osgi.util.promise/1.1.1</bundle>
-        <bundle start-level="9">mvn:org.apache.felix/org.apache.felix.coordinator/1.0.2</bundle>
-        <bundle start-level="9">mvn:org.apache.felix/org.apache.felix.converter/1.0.14</bundle>
-        <bundle start-level="10">mvn:org.apache.felix/org.apache.felix.configadmin/1.9.22</bundle>
-        <bundle start-level="11">mvn:org.apache.felix/org.apache.felix.configadmin.plugin.interpolation/1.1.4</bundle>
-        <bundle start-level="11">mvn:org.apache.felix/org.apache.felix.cm.json/1.0.6</bundle>
-        <bundle start-level="11">mvn:org.apache.sling/org.apache.sling.commons.johnzon/1.2.6</bundle>
-        <bundle start-level="11">mvn:org.apache.felix/org.apache.felix.configurator/1.0.14</bundle>
-        <!-- file install -->
-        <bundle start-level="12">mvn:org.apache.felix/org.apache.felix.fileinstall/3.7.0</bundle>
-        <!-- features service -->
-        <bundle start-level="15">mvn:org.apache.karaf.features/org.apache.karaf.features.core/4.3.3</bundle>
-        <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/2.9.0</bundle>
-    </feature>
-
-    <feature version="4.3.3" description="Karaf core feature" name="framework-logback" hidden="true">
-        <!-- persistent wiring extension -->
-        <bundle start-level="1">mvn:org.apache.karaf.features/org.apache.karaf.features.extension/4.3.3</bundle>
-        <!-- mvn: url handlers -->
-        <bundle start-level="5">mvn:org.ops4j.pax.url/pax-url-aether/2.6.7</bundle>
-        <!-- logging -->
-        <bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/${patch.pax.logging.version}</bundle>
-        <bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-logback/${patch.pax.logging.version}</bundle>
-        <!-- config admin -->
-        <bundle start-level="9">mvn:org.osgi/org.osgi.util.function/1.1.0</bundle>
-        <bundle start-level="9">mvn:org.osgi/org.osgi.util.promise/1.1.1</bundle>
-        <bundle start-level="9">mvn:org.apache.felix/org.apache.felix.coordinator/1.0.2</bundle>
-        <bundle start-level="9">mvn:org.apache.felix/org.apache.felix.converter/1.0.14</bundle>
-        <bundle start-level="10">mvn:org.apache.felix/org.apache.felix.configadmin/1.9.22</bundle>
-        <bundle start-level="11">mvn:org.apache.felix/org.apache.felix.configadmin.plugin.interpolation/1.1.4</bundle>
-        <bundle start-level="11">mvn:org.apache.felix/org.apache.felix.cm.json/1.0.6</bundle>
-        <bundle start-level="11">mvn:org.apache.sling/org.apache.sling.commons.johnzon/1.2.6</bundle>
-        <bundle start-level="11">mvn:org.apache.felix/org.apache.felix.configurator/1.0.14</bundle>
-        <!-- file install -->
-        <bundle start-level="12">mvn:org.apache.felix/org.apache.felix.fileinstall/3.7.0</bundle>
-        <!-- features service -->
-        <bundle start-level="15">mvn:org.apache.karaf.features/org.apache.karaf.features.core/4.3.3</bundle>
-    </feature>
-
-</features>

diff --git a/opendaylight/phosphorus/phosphorus-alpine/src/main/resources/startup.properties b/opendaylight/phosphorus/phosphorus-alpine/src/main/resources/startup.properties
deleted file mode 100755 (executable)
index c097c8a..0000000
--- a/opendaylight/phosphorus/phosphorus-alpine/src/main/resources/startup.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Bundles to be started on startup, with startlevel
-mvn\:org.apache.karaf.features/org.apache.karaf.features.extension/4.3.3 = 1
-mvn\:org.ops4j.pax.url/pax-url-aether/2.6.7 = 5
-mvn\:org.ops4j.pax.logging/pax-logging-log4j2/${patch.pax.logging.version} = 8
-mvn\:org.fusesource.jansi/jansi/1.18 = 8
-mvn\:org.ops4j.pax.logging/pax-logging-api/${patch.pax.logging.version} = 8
-mvn\:org.osgi/org.osgi.util.promise/1.1.1 = 9
-mvn\:org.apache.felix/org.apache.felix.coordinator/1.0.2 = 9
-mvn\:org.apache.felix/org.apache.felix.converter/1.0.14 = 9
-mvn\:org.osgi/org.osgi.util.function/1.1.0 = 9
-mvn\:org.apache.felix/org.apache.felix.configadmin/1.9.22 = 10
-mvn\:org.apache.felix/org.apache.felix.configurator/1.0.14 = 11
-mvn\:org.apache.sling/org.apache.sling.commons.johnzon/1.2.6 = 11
-mvn\:org.apache.felix/org.apache.felix.configadmin.plugin.interpolation/1.1.4 = 11
-mvn\:org.apache.felix/org.apache.felix.cm.json/1.0.6 = 11
-mvn\:org.apache.felix/org.apache.felix.fileinstall/3.7.0 = 12
-mvn\:org.apache.karaf.features/org.apache.karaf.features.core/4.3.3 = 15
-# The following are added by opendaylight-karaf-resources
-mvn\:org.osgi/org.osgi.service.event/1.4.0 = 7
-mvn\:org.apache.felix/org.apache.felix.metatype/1.2.4 = 8
-mvn\:org.opendaylight.odlparent/bcprov-framework-ext/9.0.8 = 14
-mvn\:org.opendaylight.odlparent/bcutil-framework-ext/9.0.8 = 14
-mvn\:org.opendaylight.odlparent/bcpkix-framework-ext/9.0.8 = 14
-mvn\:org.opendaylight.odlparent/logging-markers/9.0.8 = 14
-mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.core.compatibility/1.0.0 = 14
\ No newline at end of file

diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml
index 2655a46..f135dba 100644 (file)
--- a/opendaylight/pom.xml
+++ b/opendaylight/pom.xml
@@ -16,6 +16,6 @@
 
     <modules>
         <module>sulfur</module>
-        <module>phosphorus</module>
+        <module>chlorine</module>
     </modules>
 </project>