From e2d5fac2ed3004fdfbd05950e71c21b57129968c Mon Sep 17 00:00:00 2001
From: Alexander Sharov <kvendingoldo@yandex.ru>
Date: Sat, 29 Sep 2018 02:02:13 +0400
Subject: [PATCH] Update root pom.xml for docker udc-containers

---
 udc-containers/pom.xml                        |  49 +++++++++++++-----
 udc-containers/udc-backend-service/pom.xml    |  44 +++++++---------
 .../src/main/resources/Dockerfile             |   8 +--
 .../src/main/resources/entrypoint.sh          |  10 +++-
 .../target/classes/Dockerfile                 |  17 ++++++
 .../target/classes/entrypoint.sh              |   9 ++++
 .../target/context/Dockerfile                 |  17 ++++++
 .../target/context/entrypoint.sh              |   9 ++++
 .../target/maven-archiver/pom.properties      |   4 ++
 .../udc-backend-service-1.0.0-SNAPSHOT.jar    | Bin 0 -> 2670 bytes
 10 files changed, 122 insertions(+), 45 deletions(-)
 create mode 100644 udc-containers/udc-backend-service/target/classes/Dockerfile
 create mode 100644 udc-containers/udc-backend-service/target/classes/entrypoint.sh
 create mode 100644 udc-containers/udc-backend-service/target/context/Dockerfile
 create mode 100644 udc-containers/udc-backend-service/target/context/entrypoint.sh
 create mode 100644 udc-containers/udc-backend-service/target/maven-archiver/pom.properties
 create mode 100644 udc-containers/udc-backend-service/target/udc-backend-service-1.0.0-SNAPSHOT.jar

diff --git a/udc-containers/pom.xml b/udc-containers/pom.xml
index e44612a27..1989cd2c4 100644
--- a/udc-containers/pom.xml
+++ b/udc-containers/pom.xml
@@ -27,9 +27,19 @@
         <docker.baseImage>openjdk:8-jre</docker.baseImage>
         <docker.repository>university-course</docker.repository>
         <docker.registry.host>localhost</docker.registry.host>
+
+        <!-- Docker CLI executable -->
+        <dockerCli>docker</dockerCli>
     </properties>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -37,20 +47,31 @@
                     <artifactId>maven-resources-plugin</artifactId>
                     <executions>
                         <execution>
-                            <id>copy-docker-resources</id>
+                            <id>docker-resources</id>
                             <phase>none</phase>
                             <goals>
                                 <goal>resources</goal>
                             </goals>
                             <configuration>
                                 <outputDirectory>${project.build.directory}/context</outputDirectory>
-                                <includeEmptyDirs>true</includeEmptyDirs>
-                                <resources>
-                                    <resource>
-                                        <directory>src/main/resources</directory>
-                                        <filtering>true</filtering>
-                                    </resource>
-                                </resources>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>docker-dependencies</id>
+                            <phase>none</phase>
+                            <goals>
+                                <goal>copy-dependencies</goal>
+                            </goals>
+                            <configuration>
+                                <excludeTransitive>true</excludeTransitive>
+                                <stripVersion>true</stripVersion>
+                                <outputDirectory>${project.build.directory}/context</outputDirectory>
                             </configuration>
                         </execution>
                     </executions>
@@ -67,12 +88,14 @@
                             </goals>
                             <configuration>
                                 <skip>${docker.skip.build}</skip>
-                                <executable>docker</executable>
+                                <executable>${dockerCli}</executable>
                                 <arguments>
                                     <argument>build</argument>
-                                    <argument>-t</argument>
-                                    <argument>
-                                        ${docker.registry.host}/${docker.repository}/${project.artifactId}:${project.version}
+                                    <argument>--force-rm</argument>
+                                    <argument>--label=project.groupid=${project.groupId}</argument>
+                                    <argument>--label=project.artifactid=${project.artifactId}</argument>
+                                    <argument>--label=project.version=${project.version}</argument>
+                                    <argument>--tag=${docker.registry.host}/${docker.repository}/${project.artifactId}:${project.version}
                                     </argument>
                                     <argument>${project.build.directory}/context</argument>
                                 </arguments>
@@ -86,7 +109,7 @@
                             </goals>
                             <configuration>
                                 <skip>${docker.skip.push}</skip>
-                                <executable>docker</executable>
+                                <executable>${dockerCli}</executable>
                                 <arguments>
                                     <argument>push</argument>
                                     <argument>
diff --git a/udc-containers/udc-backend-service/pom.xml b/udc-containers/udc-backend-service/pom.xml
index a8569cbca..858541c6c 100644
--- a/udc-containers/udc-backend-service/pom.xml
+++ b/udc-containers/udc-backend-service/pom.xml
@@ -13,6 +13,21 @@
     <artifactId>udc-backend-service</artifactId>
     <name>UDC :: Containers :: Backend</name>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.samples</groupId>
+            <artifactId>udc-backend</artifactId>
+            <version>${project.version}</version>
+            <type>jar</type>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
     <build>
         <plugins>
             <plugin>
@@ -20,11 +35,8 @@
                 <artifactId>maven-resources-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>copy-docker-resources</id>
-                        <phase>install</phase>
-                        <goals>
-                            <goal>resources</goal>
-                        </goals>
+                        <id>docker-resources</id>
+                        <phase>process-resources</phase>
                     </execution>
                 </executions>
             </plugin>
@@ -33,26 +45,8 @@
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>copy</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.springframework.samples</groupId>
-                                    <artifactId>udc-backend</artifactId>
-                                    <version>${project.version}</version>
-                                    <type>jar</type>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${project.basedir}/target/context</outputDirectory>
-                                    <destFileName>${project.artifactId}.jar</destFileName>
-                                </artifactItem>
-                            </artifactItems>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>true</overWriteSnapshots>
-                        </configuration>
+                        <id>docker-dependencies</id>
+                        <phase>process-sources</phase>
                     </execution>
                 </executions>
             </plugin>
diff --git a/udc-containers/udc-backend-service/src/main/resources/Dockerfile b/udc-containers/udc-backend-service/src/main/resources/Dockerfile
index c48efd2c7..cd3c83cf7 100644
--- a/udc-containers/udc-backend-service/src/main/resources/Dockerfile
+++ b/udc-containers/udc-backend-service/src/main/resources/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8-jre
+FROM @docker.baseImage@
 
 ENV LANG=en_US.UTF-8 \
     LANGUAGE=en_US.UTF-8 \
@@ -14,8 +14,4 @@ RUN mkdir -p ${BASE_DIR}
 COPY entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
 
-COPY udc-backend-*.jar /udc/apps/petclinic/todo.jar
-
-LABEL project.groupid="${project.groupId}" \
-      project.artifactid="${project.artifactId}" \
-      project.version="${project.version}"
+COPY udc-backend.jar ${BASE_DIR}/udc-backend-service.jar
diff --git a/udc-containers/udc-backend-service/src/main/resources/entrypoint.sh b/udc-containers/udc-backend-service/src/main/resources/entrypoint.sh
index a9bf588e2..9cb425b51 100644
--- a/udc-containers/udc-backend-service/src/main/resources/entrypoint.sh
+++ b/udc-containers/udc-backend-service/src/main/resources/entrypoint.sh
@@ -1 +1,9 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
+########################################################
+#
+# Name: entrypoint.sh
+#
+##########################################################
+
+java -jar ${BASE_DIR}/udc-backend-service.jar
diff --git a/udc-containers/udc-backend-service/target/classes/Dockerfile b/udc-containers/udc-backend-service/target/classes/Dockerfile
new file mode 100644
index 000000000..370aa4dec
--- /dev/null
+++ b/udc-containers/udc-backend-service/target/classes/Dockerfile
@@ -0,0 +1,17 @@
+FROM openjdk:8-jre
+
+ENV LANG=en_US.UTF-8 \
+    LANGUAGE=en_US.UTF-8 \
+    LC_ALL=en_US.UTF-8
+
+ENV BASE_DIR='/udc/apps/petclinic'
+
+EXPOSE 8080
+ENTRYPOINT ["/entrypoint.sh"]
+
+RUN mkdir -p ${BASE_DIR}
+
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+COPY udc-backend-*.jar ${BASE_DIR}/udc-backend-service.jar
diff --git a/udc-containers/udc-backend-service/target/classes/entrypoint.sh b/udc-containers/udc-backend-service/target/classes/entrypoint.sh
new file mode 100644
index 000000000..9cb425b51
--- /dev/null
+++ b/udc-containers/udc-backend-service/target/classes/entrypoint.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+########################################################
+#
+# Name: entrypoint.sh
+#
+##########################################################
+
+java -jar ${BASE_DIR}/udc-backend-service.jar
diff --git a/udc-containers/udc-backend-service/target/context/Dockerfile b/udc-containers/udc-backend-service/target/context/Dockerfile
new file mode 100644
index 000000000..370aa4dec
--- /dev/null
+++ b/udc-containers/udc-backend-service/target/context/Dockerfile
@@ -0,0 +1,17 @@
+FROM openjdk:8-jre
+
+ENV LANG=en_US.UTF-8 \
+    LANGUAGE=en_US.UTF-8 \
+    LC_ALL=en_US.UTF-8
+
+ENV BASE_DIR='/udc/apps/petclinic'
+
+EXPOSE 8080
+ENTRYPOINT ["/entrypoint.sh"]
+
+RUN mkdir -p ${BASE_DIR}
+
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+COPY udc-backend-*.jar ${BASE_DIR}/udc-backend-service.jar
diff --git a/udc-containers/udc-backend-service/target/context/entrypoint.sh b/udc-containers/udc-backend-service/target/context/entrypoint.sh
new file mode 100644
index 000000000..9cb425b51
--- /dev/null
+++ b/udc-containers/udc-backend-service/target/context/entrypoint.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+########################################################
+#
+# Name: entrypoint.sh
+#
+##########################################################
+
+java -jar ${BASE_DIR}/udc-backend-service.jar
diff --git a/udc-containers/udc-backend-service/target/maven-archiver/pom.properties b/udc-containers/udc-backend-service/target/maven-archiver/pom.properties
new file mode 100644
index 000000000..068339cfe
--- /dev/null
+++ b/udc-containers/udc-backend-service/target/maven-archiver/pom.properties
@@ -0,0 +1,4 @@
+#Created by Apache Maven 3.5.4
+version=1.0.0-SNAPSHOT
+groupId=org.springframework.samples
+artifactId=udc-backend-service
diff --git a/udc-containers/udc-backend-service/target/udc-backend-service-1.0.0-SNAPSHOT.jar b/udc-containers/udc-backend-service/target/udc-backend-service-1.0.0-SNAPSHOT.jar
new file mode 100644
index 0000000000000000000000000000000000000000..dac76203e31bdf33787579e83ed791a02452fd2c
GIT binary patch
literal 2670
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

literal 0
HcmV?d00001