From 36b85d75cc3dd406bc1e4a813ea285870a197020 Mon Sep 17 00:00:00 2001
From: Nana Janashia <nn_janashia@yahoo.com>
Date: Sun, 22 Nov 2020 14:30:13 +0100
Subject: [PATCH] pass image name to shell script

---
 Jenkinsfile    | 4 ++--
 server-cmds.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 2388428..e646576 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
         maven 'Maven'
     }
     environment {
-        IMAGE_NAME = 'nanajanashia/demo-app:java-maven-1.0'
+        IMAGE_NAME = 'nanajanashia/demo-app:java-maven-1.1'
     }
     stages {
         stage('build app') {
@@ -38,7 +38,7 @@ pipeline {
             steps {
                 script {
                    echo 'deploying docker image to EC2...'
-                   def shellCmd = "bash ./server-cmds.sh"
+                   def shellCmd = "bash ./server-cmds.sh ${IMAGE_NAME}"
                    sshagent(['ec2-server-key']) {
                        sh "scp server-cmds.sh ec2-user@35.180.251.121:/home/ec2-user"
                        sh "scp docker-compose.yaml ec2-user@35.180.251.121:/home/ec2-user"
diff --git a/server-cmds.sh b/server-cmds.sh
index 3344944..1f11d9f 100644
--- a/server-cmds.sh
+++ b/server-cmds.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
-export TAG=java-maven-1.0
+export TAG=$1
 docker-compose -f docker-compose.yaml up --detach
 echo "success"