From c6c15cad13e0869cbb2e83c1dda98d31c3104907 Mon Sep 17 00:00:00 2001
From: RehanRaza <muhammad.rehan.raza@est.tech>
Date: Thu, 7 Mar 2019 15:42:51 +0000
Subject: Change to docker-maven-plugin

Change-Id: I5dc3c5b69b2ef764992e2db76eb9cc154ff5adf7
Issue-ID: DCAEGEN2-1269
Signed-off-by: RehanRaza <muhammad.rehan.raza@est.tech>
---
 datafile-app-server/pom.xml                       | 46 +++++++++++++----------
 datafile-app-server/src/main/docker/Dockerfile    | 41 ++++++++++++++++++++
 datafile-app-server/src/main/resources/Dockerfile | 41 --------------------
 3 files changed, 67 insertions(+), 61 deletions(-)
 create mode 100644 datafile-app-server/src/main/docker/Dockerfile
 delete mode 100644 datafile-app-server/src/main/resources/Dockerfile

(limited to 'datafile-app-server')

diff --git a/datafile-app-server/pom.xml b/datafile-app-server/pom.xml
index e5b87eb7..ace0389c 100644
--- a/datafile-app-server/pom.xml
+++ b/datafile-app-server/pom.xml
@@ -32,7 +32,6 @@
   <packaging>jar</packaging>
 
   <properties>
-    <dockerfile.maven.version>1.4.10</dockerfile.maven.version>
     <docker.image.name>onap/${project.groupId}.${project.artifactId}</docker.image.name>
     <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
   </properties>
@@ -55,21 +54,27 @@
       </plugin>
       <plugin>
         <groupId>com.spotify</groupId>
-        <artifactId>dockerfile-maven-plugin</artifactId>
-        <version>${dockerfile.maven.version}</version>
+        <artifactId>docker-maven-plugin</artifactId>
         <configuration>
-          <repository>${onap.nexus.dockerregistry.daily}/${docker.image.name}</repository>
-          <tag>latest</tag>
-          <dockerfile>${project.build.outputDirectory}/Dockerfile</dockerfile>
+          <serverId>${onap.nexus.dockerregistry.daily}</serverId>
+          <imageName>${docker.image.name}</imageName>
+          <imageTags>
+            <tag>latest</tag>
+          </imageTags>
+          <dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
+          <resources>
+            <resource>
+              <directory>${project.build.directory}</directory>
+              <include>${project.artifactId}.jar</include>
+              <targetPath>/target</targetPath>
+            </resource>
+            <resource>
+              <targetPath>/config</targetPath>
+              <directory>${project.basedir}/config</directory>
+              <include>*</include>
+            </resource>
+          </resources>
         </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>com.spotify</groupId>
-            <artifactId>docker-client</artifactId>
-            <classifier>shaded</classifier>
-            <version>8.10.0</version>
-          </dependency>
-        </dependencies>
         <executions>
           <execution>
             <id>build-image</id>
@@ -83,10 +88,11 @@
             <phase>deploy</phase>
             <goals>
               <goal>tag</goal>
-              <goal>push</goal>
             </goals>
             <configuration>
-              <image>${onap.nexus.dockerregistry.daily}/${docker.image.name}:latest</image>
+              <image>${docker.image.name}:latest</image>
+              <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:latest</newName>
+              <pushImage>true</pushImage>
             </configuration>
           </execution>
           <execution>
@@ -94,11 +100,11 @@
             <phase>deploy</phase>
             <goals>
               <goal>tag</goal>
-              <goal>push</goal>
             </goals>
             <configuration>
-              <image>${onap.nexus.dockerregistry.daily}/${docker.image.name}:latest</image>
+              <image>${docker.image.name}:latest</image>
               <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}</newName>
+              <pushImage>true</pushImage>
             </configuration>
           </execution>
           <execution>
@@ -106,11 +112,11 @@
             <phase>deploy</phase>
             <goals>
               <goal>tag</goal>
-              <goal>push</goal>
             </goals>
             <configuration>
-              <image>${onap.nexus.dockerregistry.daily}/${docker.image.name}:latest</image>
+              <image>${docker.image.name}:latest</image>
               <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}-${maven.build.timestamp}Z</newName>
+              <pushImage>true</pushImage>
             </configuration>
           </execution>
         </executions>
diff --git a/datafile-app-server/src/main/docker/Dockerfile b/datafile-app-server/src/main/docker/Dockerfile
new file mode 100644
index 00000000..6ab30cc2
--- /dev/null
+++ b/datafile-app-server/src/main/docker/Dockerfile
@@ -0,0 +1,41 @@
+#
+# ============LICENSE_START=======================================================
+#  Copyright (C) 2019 Nordix Foundation.
+# ================================================================================
+# Licensed 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.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+#
+FROM openjdk:8-jre-alpine
+
+WORKDIR /opt/app/datafile
+RUN mkdir -p /var/log/ONAP
+
+ADD /target/datafile-app-server.jar /opt/app/datafile/
+
+ADD /config/application.yaml /opt/app/datafile/config/
+ADD /config/cacerts /opt/app/datafile/config/
+ADD /config/datafile_endpoints.json /opt/app/datafile/config/
+ADD /config/ftpKey.jks /opt/app/datafile/config/
+ADD /config/keystore /opt/app/datafile/config/
+
+EXPOSE 8100 8433
+
+RUN addgroup -S onap && adduser -S datafile -G onap
+RUN chown -R datafile:onap /opt/app/datafile
+RUN chown -R datafile:onap /var/log/ONAP
+
+USER datafile
+
+ENTRYPOINT ["/usr/bin/java", "-jar", "/opt/app/datafile/datafile-app-server.jar"]
\ No newline at end of file
diff --git a/datafile-app-server/src/main/resources/Dockerfile b/datafile-app-server/src/main/resources/Dockerfile
deleted file mode 100644
index 6ab30cc2..00000000
--- a/datafile-app-server/src/main/resources/Dockerfile
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# ============LICENSE_START=======================================================
-#  Copyright (C) 2019 Nordix Foundation.
-# ================================================================================
-# Licensed 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.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-#
-FROM openjdk:8-jre-alpine
-
-WORKDIR /opt/app/datafile
-RUN mkdir -p /var/log/ONAP
-
-ADD /target/datafile-app-server.jar /opt/app/datafile/
-
-ADD /config/application.yaml /opt/app/datafile/config/
-ADD /config/cacerts /opt/app/datafile/config/
-ADD /config/datafile_endpoints.json /opt/app/datafile/config/
-ADD /config/ftpKey.jks /opt/app/datafile/config/
-ADD /config/keystore /opt/app/datafile/config/
-
-EXPOSE 8100 8433
-
-RUN addgroup -S onap && adduser -S datafile -G onap
-RUN chown -R datafile:onap /opt/app/datafile
-RUN chown -R datafile:onap /var/log/ONAP
-
-USER datafile
-
-ENTRYPOINT ["/usr/bin/java", "-jar", "/opt/app/datafile/datafile-app-server.jar"]
\ No newline at end of file
-- 
cgit 1.2.3-korg