diff --git a/Dockerfile b/Dockerfile
index 57fed5d..7dcd1e7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM openjdk:8-jre-alpine
EXPOSE 8080
-COPY ./target/java-maven-app-1.0-SNAPSHOT.jar /usr/app/
+COPY ./target/java-maven-app-*.jar /usr/app/
WORKDIR /usr/app
-ENTRYPOINT ["java", "-jar", "java-maven-app-1.0-SNAPSHOT.jar"]
+CMD java -jar java-maven-app-*.jar
diff --git a/Jenkinsfile b/Jenkinsfile
index da9a0da..9551141 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,36 +1,41 @@
#!/usr/bin/env groovy
-library identifier: 'jenkins-shared-library@master', retriever: modernSCM(
- [$class: 'GitSCMSource',
- remote: 'https://gitlab.com/nanuchi/jenkins-shared-library.git',
- credentialsId: 'gitlab-credentials'
- ]
-)
-
pipeline {
agent any
tools {
maven 'Maven'
}
- environment {
- IMAGE_NAME = 'nanajanashia/demo-app:java-maven-2.0'
- }
stages {
+ stage('increment version') {
+ steps {
+ script {
+ echo 'incrementing app version...'
+ sh 'mvn build-helper:parse-version versions:set \
+ -DnewVersion=\\\${parsedVersion.majorVersion}.\\\${parsedVersion.minorVersion}.\\\${parsedVersion.newIncrementalVersion \
+ versions:commit'
+ def matcher = readFile('pom.xml') =~ '(.+)'
+ def version = matcher[0][1]
+ env.IMAGE_NAME = "$version-$BUILD_NUMBER"
+ }
+ }
+ }
stage('build app') {
steps {
script {
- echo 'building application jar...'
- buildJar()
+ echo "building the application..."
+ sh 'mvn clean package'
}
}
}
stage('build image') {
steps {
script {
- echo 'building docker image...'
- buildImage(env.IMAGE_NAME)
- dockerLogin()
- dockerPush(env.IMAGE_NAME)
+ echo "building the docker image..."
+ withCredentials([usernamePassword(credentialsId: 'docker-hub-repo', passwordVariable: 'PASS', usernameVariable: 'USER')]) {
+ sh "docker build -t nanajanashia/demo-app:$IMAGE_NAME ."
+ sh "echo $PASS | docker login -u $USER --password-stdin"
+ sh "docker push nanajanashia/demo-app:$IMAGE_NAME"
+ }
}
}
}
@@ -38,15 +43,6 @@ pipeline {
steps {
script {
echo 'deploying docker image to EC2...'
-
- def shellCmd = "bash ./server-cmds.sh ${IMAGE_NAME}"
- def ec2Instance = "ec2-user@35.180.251.121"
-
- sshagent(['ec2-server-key']) {
- sh "scp server-cmds.sh ${ec2Instance}:/home/ec2-user"
- sh "scp docker-compose.yaml ${ec2Instance}:/home/ec2-user"
- sh "ssh -o StrictHostKeyChecking=no ${ec2Instance} ${shellCmd}"
- }
}
}
}
diff --git a/docker-compose.yaml b/docker-compose.yaml
deleted file mode 100644
index eb7c659..0000000
--- a/docker-compose.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-version: '3.8'
-services:
- java-maven-app:
- image: ${IMAGE}
- ports:
- - 8080:8080
- postgres:
- image: postgres:13
- ports:
- - 5432:5432
- environment:
- - POSTGRES_PASSWORD=my-pwd
diff --git a/server-cmds.sh b/server-cmds.sh
deleted file mode 100644
index b38ad34..0000000
--- a/server-cmds.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-export IMAGE=$1
-docker-compose -f docker-compose.yaml up --detach
-echo "success"
diff --git a/target/classes/com/example/Application.class b/target/classes/com/example/Application.class
new file mode 100644
index 0000000..fb82c20
Binary files /dev/null and b/target/classes/com/example/Application.class differ
diff --git a/target/java-maven-app-1.0-SNAPSHOT.jar b/target/java-maven-app-1.0-SNAPSHOT.jar
deleted file mode 100644
index 1461927..0000000
Binary files a/target/java-maven-app-1.0-SNAPSHOT.jar and /dev/null differ
diff --git a/target/java-maven-app-1.1.1.jar b/target/java-maven-app-1.1.1.jar
new file mode 100644
index 0000000..14a411b
Binary files /dev/null and b/target/java-maven-app-1.1.1.jar differ
diff --git a/target/java-maven-app-1.1.1.jar.original b/target/java-maven-app-1.1.1.jar.original
new file mode 100644
index 0000000..d07b678
Binary files /dev/null and b/target/java-maven-app-1.1.1.jar.original differ
diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties
index 2beea2e..731c1a0 100644
--- a/target/maven-archiver/pom.properties
+++ b/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
#Generated by Maven
-#Thu Oct 29 12:55:55 CET 2020
-version=1.0-SNAPSHOT
+#Sat Nov 28 14:44:39 CET 2020
+version=1.1.1
groupId=com.example
artifactId=java-maven-app
diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
index e69de29..3d953d7 100644
--- a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
@@ -0,0 +1 @@
+/Users/nanajanashia/Demo-projects/Bootcamp/java-maven-app/src/test/java/AppTest.java
diff --git a/target/surefire-reports/AppTest.txt b/target/surefire-reports/AppTest.txt
index f8cd0cc..0d7bb73 100644
--- a/target/surefire-reports/AppTest.txt
+++ b/target/surefire-reports/AppTest.txt
@@ -1,4 +1,4 @@
-------------------------------------------------------------------------------
Test set: AppTest
-------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.061 sec
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.055 sec
diff --git a/target/surefire-reports/TEST-AppTest.xml b/target/surefire-reports/TEST-AppTest.xml
index 3934e77..30655ff 100644
--- a/target/surefire-reports/TEST-AppTest.xml
+++ b/target/surefire-reports/TEST-AppTest.xml
@@ -47,7 +47,7 @@
-
+