From b28d6ff9d91355179c2d7bb6172b997c6a271d14 Mon Sep 17 00:00:00 2001
From: Nana Janashia <nn_janashia@yahoo.com>
Date: Sun, 22 Nov 2020 13:26:18 +0100
Subject: [PATCH] add docker-compose config

---
 Jenkinsfile         | 13 ++++++++-----
 docker-compose.yaml | 12 ++++++++++++
 2 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 docker-compose.yaml

diff --git a/Jenkinsfile b/Jenkinsfile
index cb43901..7255c14 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,7 +20,7 @@ pipeline {
             steps {
                script {
                   echo 'building application jar...'
-                  
+                  buildJar()
                }
             }
         }
@@ -28,17 +28,20 @@ pipeline {
             steps {
                 script {
                    echo 'building docker image...'
-                   
+                   buildImage(env.IMAGE_NAME)
+                   dockerLogin()
+                   dockerPush(env.IMAGE_NAME)
                 }
             }
         }
         stage('deploy') {
             steps {
                 script {
-                   def executeScript = "bash ./test.sh" 
+                   echo 'deploying docker image to EC2...'
+                   def dockerComposeCmd = "docker-compose -f docker-compose.yaml up"
                    sshagent(['ec2-server-key']) {
-                       sh "scp test.sh ec2-user@35.180.251.121:/home/ec2-user"
-                       sh "ssh -o StrictHostKeyChecking=no ec2-user@35.180.251.121 ${executeScript}"
+                       sh "scp docker-compose.yaml ec2-user@35.180.251.121:/home/ec2-user"
+                       sh "ssh -o StrictHostKeyChecking=no ec2-user@35.180.251.121 ${dockerComposeCmd}"
                    }
                 }
             }
diff --git a/docker-compose.yaml b/docker-compose.yaml
new file mode 100644
index 0000000..d86f0e8
--- /dev/null
+++ b/docker-compose.yaml
@@ -0,0 +1,12 @@
+version: '3.8'
+services:
+    java-maven-app:
+      image: nanajanashia/demo-app:java-maven-1.0
+      ports:
+        - 8080:8080
+    postgres:
+      image: postgres:13
+      port:
+        - 5432:5432
+      environment:
+        - POSTGRES_PASSWORD:my-pwd