add changes

This commit is contained in:
Nana Janashia
2020-11-22 14:46:01 +01:00
parent 18ecdca204
commit 1f54931484
3 changed files with 6 additions and 3 deletions

6
Jenkinsfile vendored
View File

@@ -13,7 +13,7 @@ pipeline {
maven 'Maven' maven 'Maven'
} }
environment { environment {
IMAGE_NAME = 'nanajanashia/demo-app:java-maven-1.0' IMAGE_NAME = 'nanajanashia/demo-app:java-maven-2.0'
} }
stages { stages {
stage('build app') { stage('build app') {
@@ -38,7 +38,9 @@ pipeline {
steps { steps {
script { script {
echo 'deploying docker image to EC2...' echo 'deploying docker image to EC2...'
def shellCmd = "bash ./server-cmds.sh"
def shellCmd = "bash ./server-cmds.sh ${IMAGE_NAME}"
sshagent(['ec2-server-key']) { sshagent(['ec2-server-key']) {
sh "scp server-cmds.sh ec2-user@35.180.251.121:/home/ec2-user" 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" sh "scp docker-compose.yaml ec2-user@35.180.251.121:/home/ec2-user"

View File

@@ -1,7 +1,7 @@
version: '3.8' version: '3.8'
services: services:
java-maven-app: java-maven-app:
image: nanajanashia/demo-app:java-maven-1.0 image: ${IMAGE}
ports: ports:
- 8080:8080 - 8080:8080
postgres: postgres:

View File

@@ -1,4 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
export IMAGE=$1
docker-compose -f docker-compose.yaml up --detach docker-compose -f docker-compose.yaml up --detach
echo "success" echo "success"