Unify DMaaP Data Router image creation

Fix POMs, docker-compose file, use docker plugin, remove Dockerfiles

Change-Id: I26c017eceedd30e66841d3a933070112b79ebca1
Issue-ID: DMAAP-836
Signed-off-by: Piotr Darosz <piotr.darosz@nokia.com>

12 files changed, 86 insertions, 98 deletions

diff --git a/datarouter-node/pom.xml b/datarouter-node/pom.xml
index 29e3ce47..27d21c05 100755
--- a/datarouter-node/pom.xml
+++ b/datarouter-node/pom.xml
@@ -3,6 +3,7 @@
   * org.onap.dmaap
   * ===========================================================================
   * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+  * Modifications Copyright (C) 2018 Nokia. All rights reserved.
   * ===========================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -25,7 +26,7 @@
     <parent>
         <groupId>org.onap.dmaap.datarouter</groupId>
         <artifactId>parent</artifactId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>datarouter-node</artifactId>
@@ -234,10 +235,10 @@
                     <plugin>
                         <groupId>com.spotify</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
-                        <version>1.0.0</version>
+                        <version>${docker.maven.plugin.version}</version>
                         <configuration>
                             <imageName>${onap.nexus.dockerregistry.daily}/${datarouter.node.image.name}</imageName>
-                            <dockerDirectory>${docker.location}</dockerDirectory>
+                            <baseImage>java:8</baseImage>
                             <serverId>${onap.nexus.dockerregistry.daily}</serverId>
                             <skipDockerBuild>false</skipDockerBuild>
                             <imageTags>
@@ -245,22 +246,25 @@
                                 <imageTag>latest</imageTag>
                             </imageTags>
                             <forceTags>true</forceTags>
+                            <entryPoint>["/startup.sh", "start"]</entryPoint>
                             <resources>
                                 <resource>
-                                    <targetPath>/</targetPath>
-                                    <directory>${project.basedir}</directory>
-                                    <excludes>
-                                        <exclude>target/**/*</exclude>
-                                        <exclude>pom.xml</exclude>
-                                    </excludes>
+                                    <targetPath>/opt</targetPath>
+                                    <directory>${project.build.directory}/opt</directory>
                                 </resource>
-
                                 <resource>
                                     <targetPath>/</targetPath>
-                                    <directory>${project.build.directory}</directory>
-                                    <include>**/**</include>
+                                    <directory>${docker.location}</directory>
+                                    <include>startup.sh</include>
                                 </resource>
                             </resources>
+                            <runs>
+                                <run>chmod 0700 /startup.sh</run>
+                            </runs>
+                            <exposes>
+                                <expose>8080</expose>
+                                <expose>8443</expose>
+                            </exposes>
                         </configuration>
                     </plugin>
                 </plugins>
diff --git a/datarouter-node/src/main/resources/docker/Dockerfile b/datarouter-node/src/main/resources/docker/Dockerfile
deleted file mode 100644
index fbf54566..00000000
--- a/datarouter-node/src/main/resources/docker/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM java:8 

-ADD opt /opt/

-ADD startup.sh /startup.sh

-RUN chmod 700 /startup.sh

-ENTRYPOINT ./startup.sh start

-EXPOSE 8443

-EXPOSE 8080
\ No newline at end of file
diff --git a/datarouter-prov/pom.xml b/datarouter-prov/pom.xml
index 0bb54170..2c69cbd4 100755
--- a/datarouter-prov/pom.xml
+++ b/datarouter-prov/pom.xml
@@ -3,6 +3,7 @@
   * org.onap.dmaap

   * ===========================================================================

   * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

+  * Modifications Copyright (C) 2018 Nokia. All rights reserved.

   * ===========================================================================

   * Licensed under the Apache License, Version 2.0 (the "License");

   * you may not use this file except in compliance with the License.

@@ -25,7 +26,7 @@
     <parent>

         <groupId>org.onap.dmaap.datarouter</groupId>

         <artifactId>parent</artifactId>

-        <version>1.0.2-SNAPSHOT</version>

+        <version>1.0.3-SNAPSHOT</version>

         <relativePath>../pom.xml</relativePath>

     </parent>

     <artifactId>datarouter-prov</artifactId>

@@ -263,7 +264,7 @@
                         <version>1.0.0</version>

                         <configuration>

                             <imageName>${onap.nexus.dockerregistry.daily}/${datarouter.prov.image.name}</imageName>

-                            <dockerDirectory>${docker.location}</dockerDirectory>

+                            <baseImage>java:8</baseImage>

                             <serverId>${onap.nexus.dockerregistry.daily}</serverId>

                             <skipDockerBuild>false</skipDockerBuild>

                             <imageTags>

@@ -271,22 +272,25 @@
                                 <imageTag>latest</imageTag>

                             </imageTags>

                             <forceTags>true</forceTags>

+                            <entryPoint>["/startup.sh", "start"]</entryPoint>

                             <resources>

                                 <resource>

-                                    <targetPath>/</targetPath>

-                                    <directory>${project.basedir}</directory>

-                                    <excludes>

-                                        <exclude>target/**/*</exclude>

-                                        <exclude>pom.xml</exclude>

-                                    </excludes>

+                                    <targetPath>/opt</targetPath>

+                                    <directory>${project.build.directory}/opt</directory>

                                 </resource>

-

                                 <resource>

                                     <targetPath>/</targetPath>

-                                    <directory>${project.build.directory}</directory>

-                                    <include>**/**</include>

+                                    <directory>${docker.location}</directory>

+                                    <include>startup.sh</include>

                                 </resource>

                             </resources>

+                            <runs>

+                                <run>chmod 0700 /startup.sh</run>

+                            </runs>

+                            <exposes>

+                                <expose>8080</expose>

+                                <expose>8443</expose>

+                            </exposes>

                         </configuration>

                     </plugin>

                 </plugins>

diff --git a/datarouter-prov/src/main/resources/docker/Dockerfile b/datarouter-prov/src/main/resources/docker/Dockerfile
deleted file mode 100644
index 215c4332..00000000
--- a/datarouter-prov/src/main/resources/docker/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM java:8

-ADD opt /opt/

-ADD startup.sh /startup.sh

-RUN chmod 700 /startup.sh

-ENTRYPOINT ./startup.sh start

-EXPOSE 8443

-EXPOSE 8080

-

-

diff --git a/datarouter-subscriber/pom.xml b/datarouter-subscriber/pom.xml
index 87b82f1d..615dbb41 100755
--- a/datarouter-subscriber/pom.xml
+++ b/datarouter-subscriber/pom.xml
@@ -3,6 +3,7 @@
   * org.onap.dmaap
   * ===========================================================================
   * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+  * Modifications Copyright (C) 2018 Nokia. All rights reserved.
   * ===========================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -25,7 +26,7 @@
     <parent>
         <groupId>org.onap.dmaap.datarouter</groupId>
         <artifactId>parent</artifactId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>datarouter-subscriber</artifactId>
@@ -165,10 +166,10 @@
                     <plugin>
                         <groupId>com.spotify</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
-                        <version>1.0.0</version>
+                        <version>${docker.maven.plugin.version}</version>
                         <configuration>
                             <imageName>${onap.nexus.dockerregistry.daily}/${datarouter.prov.image.name}</imageName>
-                            <dockerDirectory>${docker.location}</dockerDirectory>
+                            <baseImage>java:8</baseImage>
                             <serverId>${onap.nexus.dockerregistry.daily}</serverId>
                             <skipDockerBuild>false</skipDockerBuild>
                             <imageTags>
@@ -176,22 +177,25 @@
                                 <imageTag>latest</imageTag>
                             </imageTags>
                             <forceTags>true</forceTags>
+                            <entryPoint>["/startup.sh", "start"]</entryPoint>
                             <resources>
                                 <resource>
-                                    <targetPath>/</targetPath>
-                                    <directory>${project.basedir}</directory>
-                                    <excludes>
-                                        <exclude>target/**/*</exclude>
-                                        <exclude>pom.xml</exclude>
-                                    </excludes>
+                                    <targetPath>/opt</targetPath>
+                                    <directory>${project.build.directory}/opt</directory>
                                 </resource>
-
                                 <resource>
                                     <targetPath>/</targetPath>
-                                    <directory>${project.build.directory}</directory>
-                                    <include>**/**</include>
+                                    <directory>${docker.location}</directory>
+                                    <include>startup.sh</include>
                                 </resource>
                             </resources>
+                            <runs>
+                                <run>chmod 0700 /startup.sh</run>
+                            </runs>
+                            <exposes>
+                                <expose>8080</expose>
+                                <expose>8443</expose>
+                            </exposes>
                         </configuration>
                     </plugin>
                 </plugins>
diff --git a/datarouter-subscriber/src/main/resources/docker/Dockerfile b/datarouter-subscriber/src/main/resources/docker/Dockerfile
deleted file mode 100644
index 6cc74cc3..00000000
--- a/datarouter-subscriber/src/main/resources/docker/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM java:8
-ADD opt /opt/
-ADD startup.sh /startup.sh
-RUN chmod 700 /startup.sh
-ENTRYPOINT ./startup.sh start
-EXPOSE 7070
\ No newline at end of file
diff --git a/docker-compose/database/sql_init_01.sql b/docker-compose/database/sql_init_01.sql
index 356a67a9..356a67a9 100755..100644
--- a/docker-compose/database/sql_init_01.sql
+++ b/docker-compose/database/sql_init_01.sql
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index a7b0f982..beb79a0f 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -3,6 +3,7 @@
 # * org.onap.dmaap
 # * ===========================================================================
 # * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# * Modifications Copyright (C) 2018 Nokia. All rights reserved.
 # * ===========================================================================
 # * Licensed under the Apache License, Version 2.0 (the "License");
 # * you may not use this file except in compliance with the License.
@@ -27,83 +28,77 @@ services:
     container_name: datarouter-prov
     hostname: dmaap-dr-prov
     ports:
-     - "443:8443"
-     - "8443:8443"
-     - "8080:8080"
+    - "443:8443"
+    - "8443:8443"
+    - "8080:8080"
     volumes:
-     - ./prov_data/provserver.properties:/opt/app/datartr/etc/provserver.properties
-     - ./prov_data/addSubscriber.txt:/opt/app/datartr/addSubscriber.txt
-     - ./prov_data/addFeed3.txt:/opt/app/datartr/addFeed3.txt
+    - ./prov_data/provserver.properties:/opt/app/datartr/etc/provserver.properties
+    - ./prov_data/addSubscriber.txt:/opt/app/datartr/addSubscriber.txt
+    - ./prov_data/addFeed3.txt:/opt/app/datartr/addFeed3.txt
     depends_on:
       mariadb_container:
         condition: service_healthy
     healthcheck:
       test: ["CMD", "curl", "-f", "http://dmaap-dr-prov:8080/internal/prov"]
       interval: 10s
-      timeout: 10s
+      timeout: 30s
       retries: 5
-    extra_hosts:
-      - "dmaap-dr-node:172.100.0.4"
     networks:
       testing_net:
-        ipv4_address: 172.100.0.3
+        aliases:
+        - dmaap-dr-prov
 
   datarouter-node:
     image: nexus3.onap.org:10001/onap/dmaap/datarouter-node
     container_name: datarouter-node
     hostname: dmaap-dr-node
     ports:
-     - "9443:8443"
-     - "9090:8080"
+    - "9443:8443"
+    - "9090:8080"
     volumes:
-     - ./node_data/node.properties:/opt/app/datartr/etc/node.properties
+    - ./node_data/node.properties:/opt/app/datartr/etc/node.properties
     depends_on:
       datarouter-prov:
         condition: service_healthy
-    extra_hosts:
-      - "dmaap-dr-prov:172.100.0.3"
     networks:
       testing_net:
-        ipv4_address: 172.100.0.4
+        aliases:
+        - dmaap-dr-node
 
   datarouter-subscriber:
-      image: nexus3.onap.org:10001/onap/dmaap/datarouter-subscriber
-      container_name: subscriber-node
-      hostname: subscriber.com
-      ports:
-       - "7070:7070"
-      volumes:
-       - ./subscriber_data/subscriber.properties:/opt/app/subscriber/etc/subscriber.properties
-      networks:
-        testing_net:
-          ipv4_address: 172.100.0.5
+    image: nexus3.onap.org:10001/onap/dmaap/datarouter-subscriber
+    container_name: subscriber-node
+    hostname: subscriber.com
+    ports:
+    - "7070:7070"
+    volumes:
+    - ./subscriber_data/subscriber.properties:/opt/app/subscriber/etc/subscriber.properties
+    networks:
+      testing_net:
+        aliases:
+        - subscriber.com
 
   mariadb_container:
     image: mariadb:10.2.14
     container_name: mariadb
+    hostname: datarouter-mariadb
     ports:
-      - "3306:3306"
-#    volumes:
-#     - ./database/sql_init_01.sql:/docker-entrypoint-initdb.d/sql_init_01.sql
+    - "3306:3306"
     environment:
       MYSQL_ROOT_PASSWORD: datarouter
       MYSQL_DATABASE: datarouter
       MYSQL_USER: datarouter
       MYSQL_PASSWORD: datarouter
     healthcheck:
-      test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost", "--silent"]
+      test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost", "-u", "datarouter", "-pdatarouter", "--silent"]
       interval: 10s
       timeout: 30s
       retries: 5
-
     networks:
       testing_net:
-        ipv4_address: 172.100.0.2
+        aliases:
+        - datarouter-mariadb
 
 networks:
   testing_net:
-    driver: bridge
-    ipam:
-      driver: default
-      config:
-        - subnet: 172.100.0.0/16
+    driver: bridge
\ No newline at end of file
diff --git a/docker-compose/node_data/node.properties b/docker-compose/node_data/node.properties
index de38cb6f..03096570 100644
--- a/docker-compose/node_data/node.properties
+++ b/docker-compose/node_data/node.properties
@@ -2,7 +2,8 @@
 # ============LICENSE_START==================================================
 # * org.onap.dmaap
 # * ===========================================================================
-# * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# * Copyright � 2017 AT&T Intellectual Property. All rights reserved.
+# * Modifications Copyright (C) 2018 Nokia. All rights reserved.
 # * ===========================================================================
 # * Licensed under the Apache License, Version 2.0 (the "License");
 # * you may not use this file except in compliance with the License.
diff --git a/docker-compose/prov_data/provserver.properties b/docker-compose/prov_data/provserver.properties
index 744bc9ce..c37bd4fb 100755
--- a/docker-compose/prov_data/provserver.properties
+++ b/docker-compose/prov_data/provserver.properties
@@ -3,6 +3,7 @@
 # * org.onap.dmaap
 # * ===========================================================================
 # * Copyright � 2017 AT&T Intellectual Property. All rights reserved.
+# * Modifications Copyright (C) 2018 Nokia. All rights reserved.
 # * ===========================================================================
 # * Licensed under the Apache License, Version 2.0 (the "License");
 # * you may not use this file except in compliance with the License.
@@ -44,6 +45,6 @@ org.onap.dmaap.datarouter.provserver.isaddressauthenabled = false
 
 # Database access
 org.onap.dmaap.datarouter.db.driver   = org.mariadb.jdbc.Driver
-org.onap.dmaap.datarouter.db.url      = jdbc:mariadb://172.100.0.2:3306/datarouter
+org.onap.dmaap.datarouter.db.url      = jdbc:mariadb://datarouter-mariadb:3306/datarouter
 org.onap.dmaap.datarouter.db.login    = datarouter
 org.onap.dmaap.datarouter.db.password = datarouter
diff --git a/pom.xml b/pom.xml
index 17744adf..dee74870 100755
--- a/pom.xml
+++ b/pom.xml
@@ -3,6 +3,7 @@
   * org.onap.dmaap
   * ===========================================================================
   * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+  * Modifications Copyright (C) 2018 Nokia. All rights reserved.
   * ===========================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -25,7 +26,7 @@
     <groupId>org.onap.dmaap.datarouter</groupId>
     <artifactId>parent</artifactId>
     <name>dmaap-datarouter</name>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.3-SNAPSHOT</version>
     <packaging>pom</packaging>
     <url>https://github.com/att/DMAAP_DATAROUTER</url>
     <parent>
diff --git a/version.properties b/version.properties
index b042a353..688e881b 100644
--- a/version.properties
+++ b/version.properties
@@ -27,7 +27,7 @@
 

 major=1

 minor=0

-patch=2

+patch=3

 

 base_version=${major}.${minor}.${patch}