From 95e3b9d368896bf1d9f728a123b3604e6038c797 Mon Sep 17 00:00:00 2001
From: mostafagoda45 <mostafagoda1993@gmail.com>
Date: Sun, 12 Aug 2018 18:22:42 +0200
Subject: [PATCH] Docker changes

---
 Dockerfile         | 10 +++++++++
 docker-compose.yml | 21 ++++++++++++++++++
 pom.xml            | 53 ++++++++++++++++++++++++++++++++++------------
 3 files changed, 71 insertions(+), 13 deletions(-)
 create mode 100644 Dockerfile
 create mode 100644 docker-compose.yml

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..6c39752
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,10 @@
+FROM openjdk:8-jre-alpine
+LABEL description="java-mysql-example-app"
+LABEL version="1.0"
+LABEL maintainer="Hatem AlSum (halsum@cloud9ers.com)"
+
+ADD target/java-mysql-example-app-1.0-SNAPSHOT-jar-with-dependencies.jar app.jar
+
+CMD echo "The application will start now..." && \
+    sleep 60s && \
+    java -jar app.jar 
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..7886c1f
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,21 @@
+version: '2'
+services:
+    java-app:
+        image: jexampleapp
+        environment:
+            - PORT=8080
+            - MYSQLS_HOSTNAME=app-mysql 
+            - MYSQLS_PORT=3306
+            - MYSQLS_USERNAME=root
+            - MYSQLS_PASSWORD=my-secret-pw 
+            - MYSQLS_DATABASE=mysql
+        ports:
+            - 8080:8080
+        depends_on:
+            - app-mysql
+    app-mysql :
+        image: mysql:5.7
+        environment:
+            - MYSQL_ROOT_PASSWORD=my-secret-pw
+        ports:
+            - 3306:3306
diff --git a/pom.xml b/pom.xml
index b23e0ba..a3ea8bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,11 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+<project xmlns="http://maven.apache.org/POM/4.0.0" 
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.cloudcontrolled.sample.mysql</groupId>
-  <artifactId>java-mysql-example-app</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.cloudcontrolled.sample.mysql</groupId>
+    <artifactId>java-mysql-example-app</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
     <dependencies>
         <dependency>
             <groupId>mysql</groupId>
@@ -16,7 +15,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-servlet</artifactId>
-            <version>7.6.0.v20120127</version>
+            <version>9.3.8.v20160314</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -40,7 +39,12 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
                     <execution>
                         <id>copy-dependencies</id>
                         <phase>package</phase>
-                        <goals><goal>copy-dependencies</goal></goals>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -49,10 +53,33 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.3.2</version>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
-            </plugin>        
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>lib/</classpathPrefix>
+                            <mainClass>com.cloudcontrolled.sample.mysql.App</mainClass>
+                        </manifest>
+                    </archive>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>