Update Jenkinsfile

.gitignore

@@ -1,2 +1,2 @@
 .idea/*
-target
+target

Dockerfile

@@ -2,7 +2,7 @@ FROM openjdk:8-jre-alpine
 
 EXPOSE 8080
 
-COPY ./target/java-maven-app-*.jar /usr/app/
+COPY ./target/java-maven-app-1.0-SNAPSHOT.jar /usr/app/
 WORKDIR /usr/app
 
-CMD java -jar java-maven-app-*.jar
+ENTRYPOINT ["java", "-jar", "java-maven-app-1.0-SNAPSHOT.jar"]

Jenkinsfile

@@ -1,74 +1,52 @@
 #!/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 {
-        ECR_REPO_URL = '664574038682.dkr.ecr.eu-west-3.amazonaws.com'
+        IMAGE_NAME = 'nanajanashia/demo-app:java-maven-2.0'
-        IMAGE_REPO = "${ECR_REPO_URL}/java-maven-app"
     }
     stages {
-        stage('increment version') {
-            steps {
-                script {
-                    echo 'incrementing app version...'
-                    sh 'mvn build-helper:parse-version versions:set \
-                        -DnewVersion=\\\${parsedVersion.majorVersion}.\\\${parsedVersion.minorVersion}.\\\${parsedVersion.nextIncrementalVersion} \
-                        versions:commit'
-                    def matcher = readFile('pom.xml') =~ '<version>(.+)</version>'
-                    def version = matcher[0][1]
-                    env.IMAGE_NAME = "$version-$BUILD_NUMBER"
-                    echo "############ ${IMAGE_REPO}"
-                }
-            }
-        }
         stage('build app') {
             steps {
                script {
-                   echo "building the application..."
+                  echo 'building application jar...'
-                   sh 'mvn clean package'
+                  buildJar()
                }
             }
         }
         stage('build image') {
             steps {
                 script {
-                    echo "building the docker image..."
+                   echo 'building docker image...'
-                    withCredentials([usernamePassword(credentialsId: 'ecr-credentials', passwordVariable: 'PASS', usernameVariable: 'USER')]) {
+                   buildImage(env.IMAGE_NAME)
-                        sh "docker build -t ${IMAGE_REPO}:${IMAGE_NAME} ."
+                   dockerLogin()
-                        sh "echo $PASS | docker login -u $USER --password-stdin ${ECR_REPO_URL}"
+                   dockerPush(env.IMAGE_NAME)
-                        sh "docker push ${IMAGE_REPO}:${IMAGE_NAME}"
-                    }
                 }
             }
         }
         stage('deploy') {
-            environment {
-                AWS_ACCESS_KEY_ID = credentials('jenkins_aws_access_key_id')
-                AWS_SECRET_ACCESS_KEY = credentials('jenkins_aws_secret_access_key')
-                APP_NAME = 'java-maven-app'
-            }
             steps {
                 script {
-                    echo 'deploying docker image...'
+                   echo 'deploying docker image to EC2...'
-                    sh 'envsubst < kubernetes/deployment.yaml | kubectl apply -f -'
+
-                    sh 'envsubst < kubernetes/service.yaml | kubectl apply -f -'
+                   def shellCmd = "bash ./server-cmds.sh ${IMAGE_NAME}"
-                }
+                   def ec2Instance = "ec2-user@35.180.251.121"
-            }
+
-        }
+                   sshagent(['ec2-server-key']) {
-        stage('commit version update') {
+                       sh "scp -o StrictHostKeyChecking=no server-cmds.sh ${ec2Instance}:/home/ec2-user"
-            steps {
+                       sh "scp -o StrictHostKeyChecking=no docker-compose.yaml ${ec2Instance}:/home/ec2-user"
-                script {
+                       sh "ssh -o StrictHostKeyChecking=no ${ec2Instance} ${shellCmd}"
-                    withCredentials([usernamePassword(credentialsId: 'gitlab-credentials', passwordVariable: 'PASS', usernameVariable: 'USER')]) {
+                   }
-                        sh 'git config user.email "jenkins@example.com"'
-                        sh 'git config user.name "Jenkins"'
-                        sh "git remote set-url origin https://${USER}:${PASS}@gitlab.com/nanuchi/java-maven-app.git"
-                        sh 'git add .'
-                        sh 'git commit -m "ci: version bump"'
-                        sh 'git push origin HEAD:jenkins-jobs'
-                    }
                 }
             }
         }

docker-compose.yaml

@@ -0,0 +1,12 @@
+version: '3.8'
+services:
+    java-maven-app:
+      image: ${IMAGE}
+      ports:
+        - 8080:8080
+    postgres:
+      image: postgres:13
+      ports:
+        - 5432:5432
+      environment:
+        - POSTGRES_PASSWORD=my-pwd

kubernetes/deployment.yaml

@@ -1,24 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: $APP_NAME
-  labels:
-    app: $APP_NAME
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: $APP_NAME
-  template:
-    metadata:
-      labels:
-        app: $APP_NAME
-    spec:
-      imagePullSecrets:
-        - name: my-registry-key
-      containers:
-        - name: $APP_NAME
-          image: $IMAGE_REPO:$IMAGE_NAME
-          imagePullPolicy: Always
-          ports:
-            - containerPort: 8080

kubernetes/service.yaml

@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: $APP_NAME
-spec:
-  selector:
-    app: $APP_NAME
-  ports:
-    - protocol: TCP
-      port: 80
-      targetPort: 8080

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.example</groupId>
     <artifactId>java-maven-app</artifactId>
-    <version>1.1.5</version>
+    <version>1.0-SNAPSHOT</version>
 
     <build>
         <plugins>
@@ -24,7 +24,11 @@
             </plugin>
         </plugins>
     </build>
-
+    <properties>
+        <java.version>1.8</java.version>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

server-cmds.sh

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

target/maven-archiver/pom.properties

@@ -1,5 +0,0 @@
-#Generated by Maven
-#Sat Dec 05 14:30:39 UTC 2020
-version=1.1.5
-groupId=com.example
-artifactId=java-maven-app

target/surefire-reports/AppTest.txt

@@ -1,4 +0,0 @@
--------------------------------------------------------------------------------
-Test set: AppTest
--------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.126 sec

target/surefire-reports/TEST-AppTest.xml

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite tests="1" failures="0" name="AppTest" time="0.007" errors="0" skipped="0">
-  <properties>
-    <property name="java.runtime.name" value="OpenJDK Runtime Environment"/>
-    <property name="sun.boot.library.path" value="/usr/local/openjdk-8/jre/lib/amd64"/>
-    <property name="java.vm.version" value="25.242-b08"/>
-    <property name="java.vm.vendor" value="Oracle Corporation"/>
-    <property name="maven.multiModuleProjectDirectory" value="/var/jenkins_home/workspace/java-maven-app_jenkins-jobs"/>
-    <property name="java.vendor.url" value="http://java.oracle.com/"/>
-    <property name="path.separator" value=":"/>
-    <property name="guice.disable.misplaced.annotation.check" value="true"/>
-    <property name="java.vm.name" value="OpenJDK 64-Bit Server VM"/>
-    <property name="file.encoding.pkg" value="sun.io"/>
-    <property name="sun.java.launcher" value="SUN_STANDARD"/>
-    <property name="sun.os.patch.level" value="unknown"/>
-    <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
-    <property name="user.dir" value="/var/jenkins_home/workspace/java-maven-app_jenkins-jobs"/>
-    <property name="java.runtime.version" value="1.8.0_242-b08"/>
-    <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
-    <property name="java.endorsed.dirs" value="/usr/local/openjdk-8/jre/lib/endorsed"/>
-    <property name="os.arch" value="amd64"/>
-    <property name="java.io.tmpdir" value="/tmp"/>
-    <property name="line.separator" value="
-"/>
-    <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
-    <property name="os.name" value="Linux"/>
-    <property name="classworlds.conf" value="/var/jenkins_home/tools/hudson.tasks.Maven_MavenInstallation/Maven/bin/m2.conf"/>
-    <property name="sun.jnu.encoding" value="UTF-8"/>
-    <property name="java.library.path" value="/usr/java/packages/lib/amd64:/usr/lib64:/lib64:/lib:/usr/lib"/>
-    <property name="maven.conf" value="/var/jenkins_home/tools/hudson.tasks.Maven_MavenInstallation/Maven/conf"/>
-    <property name="java.specification.name" value="Java Platform API Specification"/>
-    <property name="java.class.version" value="52.0"/>
-    <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
-    <property name="os.version" value="5.4.0-51-generic"/>
-    <property name="library.jansi.path" value="/var/jenkins_home/tools/hudson.tasks.Maven_MavenInstallation/Maven/lib/jansi-native"/>
-    <property name="user.home" value="/var/jenkins_home"/>
-    <property name="user.timezone" value="Etc/UTC"/>
-    <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
-    <property name="java.specification.version" value="1.8"/>
-    <property name="file.encoding" value="UTF-8"/>
-    <property name="user.name" value="jenkins"/>
-    <property name="java.class.path" value="/var/jenkins_home/tools/hudson.tasks.Maven_MavenInstallation/Maven/boot/plexus-classworlds-2.6.0.jar"/>
-    <property name="java.vm.specification.version" value="1.8"/>
-    <property name="sun.arch.data.model" value="64"/>
-    <property name="java.home" value="/usr/local/openjdk-8/jre"/>
-    <property name="sun.java.command" value="org.codehaus.plexus.classworlds.launcher.Launcher clean package"/>
-    <property name="java.specification.vendor" value="Oracle Corporation"/>
-    <property name="user.language" value="en"/>
-    <property name="awt.toolkit" value="sun.awt.X11.XToolkit"/>
-    <property name="java.vm.info" value="mixed mode"/>
-    <property name="java.version" value="1.8.0_242"/>
-    <property name="java.ext.dirs" value="/usr/local/openjdk-8/jre/lib/ext:/usr/java/packages/lib/ext"/>
-    <property name="securerandom.source" value="file:/dev/./urandom"/>
-    <property name="sun.boot.class.path" value="/usr/local/openjdk-8/jre/lib/resources.jar:/usr/local/openjdk-8/jre/lib/rt.jar:/usr/local/openjdk-8/jre/lib/sunrsasign.jar:/usr/local/openjdk-8/jre/lib/jsse.jar:/usr/local/openjdk-8/jre/lib/jce.jar:/usr/local/openjdk-8/jre/lib/charsets.jar:/usr/local/openjdk-8/jre/lib/jfr.jar:/usr/local/openjdk-8/jre/classes"/>
-    <property name="java.vendor" value="Oracle Corporation"/>
-    <property name="maven.home" value="/var/jenkins_home/tools/hudson.tasks.Maven_MavenInstallation/Maven"/>
-    <property name="file.separator" value="/"/>
-    <property name="java.vendor.url.bug" value="http://bugreport.sun.com/bugreport/"/>
-    <property name="sun.cpu.endian" value="little"/>
-    <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
-    <property name="sun.cpu.isalist" value=""/>
-  </properties>
-  <testcase classname="AppTest" name="testApp" time="0.007"/>
-</testsuite>