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"