diff --git a/Jenkinsfile b/Jenkinsfile index 2388428..71fdaed 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-2.0' } stages { stage('build app') { @@ -38,7 +38,9 @@ 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/docker-compose.yaml b/docker-compose.yaml index f4b8808..eb7c659 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,7 +1,7 @@ version: '3.8' services: java-maven-app: - image: nanajanashia/demo-app:java-maven-1.0 + image: ${IMAGE} ports: - 8080:8080 postgres: diff --git a/server-cmds.sh b/server-cmds.sh index 300f1a9..b38ad34 100644 --- a/server-cmds.sh +++ b/server-cmds.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +export IMAGE=$1 docker-compose -f docker-compose.yaml up --detach echo "success"