From 5a41037c1c6085febf8d5d9a41f055c9bca3f0d1 Mon Sep 17 00:00:00 2001
From: Piotr Darosz <piotr.darosz@nokia.com>
Date: Wed, 3 Oct 2018 14:31:25 +0200
Subject: 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>
---
 datarouter-subscriber/pom.xml                      | 28 ++++++++++++----------
 .../src/main/resources/docker/Dockerfile           |  6 -----
 2 files changed, 16 insertions(+), 18 deletions(-)
 delete mode 100644 datarouter-subscriber/src/main/resources/docker/Dockerfile

(limited to 'datarouter-subscriber')

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