From c9d167df44e870694dbdd8449dd935f2be424520 Mon Sep 17 00:00:00 2001
From: Nana Janashia <nn_janashia@yahoo.com>
Date: Sat, 19 Dec 2020 13:18:16 +0100
Subject: [PATCH] add docker login

---
 Jenkinsfile    | 5 ++++-
 server-cmds.sh | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 5e689f5..4523c43 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -54,6 +54,9 @@ pipeline {
             }
         }
         stage('deploy') {
+            environment {
+                DOCKER_CREDS = credentials('docker-hub-repo')
+            }
             steps {
                 script {
                    echo "waiting for EC2 server to initialize" 
@@ -62,7 +65,7 @@ pipeline {
                    echo 'deploying docker image to EC2...'
                    echo "${EC2_PUBLIC_IP}"
 
-                   def shellCmd = "bash ./server-cmds.sh ${IMAGE_NAME}"
+                   def shellCmd = "bash ./server-cmds.sh ${IMAGE_NAME} ${DOCKER_CREDS_USR} ${DOCKER_CREDS_PSW}"
                    def ec2Instance = "ec2-user@${EC2_PUBLIC_IP}"
 
                    sshagent(['server-ssh-key']) {
diff --git a/server-cmds.sh b/server-cmds.sh
index b38ad34..65d66c0 100644
--- a/server-cmds.sh
+++ b/server-cmds.sh
@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
 export IMAGE=$1
+export DOCKER_USER=$2
+export DOCKER_PWD=$3
+echo $DOCKER_PWD | docker login -u $DOCKER_USER --password-stdin
 docker-compose -f docker-compose.yaml up --detach
 echo "success"