diff --git a/Jenkinsfile b/Jenkinsfile index e646576..2388428 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ pipeline { maven 'Maven' } environment { - IMAGE_NAME = 'nanajanashia/demo-app:java-maven-1.1' + IMAGE_NAME = 'nanajanashia/demo-app:java-maven-1.0' } stages { stage('build app') { @@ -38,7 +38,7 @@ pipeline { steps { script { echo 'deploying docker image to EC2...' - def shellCmd = "bash ./server-cmds.sh ${IMAGE_NAME}" + def shellCmd = "bash ./server-cmds.sh" 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 e20a8f3..f4b8808 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,7 +1,7 @@ version: '3.8' services: java-maven-app: - image: "${TAG}" + image: nanajanashia/demo-app:java-maven-1.0 ports: - 8080:8080 postgres: diff --git a/server-cmds.sh b/server-cmds.sh index 1f11d9f..300f1a9 100644 --- a/server-cmds.sh +++ b/server-cmds.sh @@ -1,5 +1,4 @@ #!/usr/bin/env bash -export TAG=$1 docker-compose -f docker-compose.yaml up --detach echo "success"