Merge "reduce sdnc-ansible-server image footprint"

Former-commit-id: fb338f54998e023140f3fdd2c0d07e57f7e1f879

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index 7579604..d30fee6 100644 (file)
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -3,6 +3,39 @@
 Release Notes
 =============
 
+Version: 1.4.4
+--------------
+
+**Bugs Fixes**
+
+The following bugs are fixed in the SDNC Casablanca January 2019 maintenance release:
+
++------------+------------------------------------------------------------------------------------------+
+| Jira #     | Abstract                                                                                 |
++============+==========================================================================================+
+| [SDNC-405] | SDNC API documentation is missing on ReadTheDocs                                         |
++------------+------------------------------------------------------------------------------------------+
+| [SDNC-523] | vnf-information.vnf-id validation check should not be mandatory in validate-vnf-input DG |
++------------+------------------------------------------------------------------------------------------+
+| [SDNC-532] | oof query failed due to hostname change, returning unknown host                          |
++------------+------------------------------------------------------------------------------------------+
+| [SDNC-534] | wrong "input" field in DMaaP message template                                            |
++------------+------------------------------------------------------------------------------------------+
+| [SDNC-536] | Upgrade zjsonpatch version to remediate vulnerabilities                                  |
++------------+------------------------------------------------------------------------------------------+
+| [SDNC-537] | Update to spring-boot 2.1.0-RELEASE                                                      |
++------------+------------------------------------------------------------------------------------------+
+| [SDNC-540] | CCVPN closed loop testing failed.                                                        |
++------------+------------------------------------------------------------------------------------------+
+| [SDNC-542] | [PORT] Network Discovery microservice does not log                                       |
++------------+------------------------------------------------------------------------------------------+
+| [SDNC-546] | CCVPN bugs fix for manual free integration test                                          |
++------------+------------------------------------------------------------------------------------------+
+| [SDNC-549] | Retain MD-SAL data on pod recreate                                                       |
++------------+------------------------------------------------------------------------------------------+
+
+
+
 Version: 1.4.3
 --------------
 

diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml
index 1be5d88..d0c235f 100644 (file)
--- a/installation/dmaap-listener/pom.xml
+++ b/installation/dmaap-listener/pom.xml
@@ -197,7 +197,7 @@
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
-                        <version>0.16.5</version>
+                        <version>0.28.0</version>
                         <inherited>false</inherited>
                         <configuration>
                             <images>
@@ -206,7 +206,7 @@
                                     <build>
                                         <cleanup>try</cleanup>
                                         <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-                                        <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+                                        <dockerFile>Dockerfile</dockerFile>
                                         <tags>
                                             <tag>${project.version}</tag>
                                             <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>

diff --git a/installation/dmaap-listener/src/main/docker/Dockerfile b/installation/dmaap-listener/src/main/docker/Dockerfile
index 28676fa..71f2eca 100644 (file)
--- a/installation/dmaap-listener/src/main/docker/Dockerfile
+++ b/installation/dmaap-listener/src/main/docker/Dockerfile
@@ -1,9 +1,22 @@
 # Base ubuntu with added packages needed for open ecomp
-FROM onap/ccsdk-ubuntu-image:${ccsdk.docker.version}
+FROM alpine:3.8
+
 MAINTAINER SDNC Team (onap-sdnc@lists.onap.org)
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
-ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties
 
+ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
+ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties
+    
+RUN apk update && apk add \
+    bash \
+    git \
+    openjdk8 \
+    maven \
+    mysql-client \
+    nodejs \
+    py-pip \
+    graphviz \
+    unzip \
+    rsync
 
 # copy deliverables to opt
 COPY opt /opt

diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index ed84080..9c69c9e 100644 (file)
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -95,7 +95,7 @@
                        <plugin>
                                <groupId>io.fabric8</groupId>
                                <artifactId>docker-maven-plugin</artifactId>
-                               <version>0.16.5</version>
+                               <version>0.28.0</version>
                                <inherited>false</inherited>
                                <configuration>
                                        <images>
@@ -104,7 +104,7 @@
                                                        <build>
                                                                <cleanup>try</cleanup>
                                                                <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-                                                               <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+                                                               <dockerFile>Dockerfile</dockerFile>
                                                                <tags>
                                                                        <tag>${project.version}</tag>
                                                                        <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>

diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile
index f424238..3565ff7 100755 (executable)
--- a/installation/sdnc/src/main/docker/Dockerfile
+++ b/installation/sdnc/src/main/docker/Dockerfile
@@ -3,7 +3,8 @@ FROM onap/ccsdk-odlsli-alpine-image:${ccsdk.docker.version}
 
 MAINTAINER SDN-C Team (sdnc@lists.onap.org)
 
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
+#ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
+ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
 ENV ODL_HOME /opt/opendaylight/current
 ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties
 ENV SDNC_STORE_DIR /opt/onap/sdnc/data/stores