Update Jenkinsfile

.gitignore

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

Jenkinsfile

@@ -5,10 +5,6 @@ pipeline {
     tools {
         maven 'Maven'
     }
-    environment {
-        ECR_REPO_URL = '664574038682.dkr.ecr.eu-west-3.amazonaws.com'
-        IMAGE_REPO = "${ECR_REPO_URL}/java-maven-app"
-    }
     stages {
         stage('increment version') {
             steps {
@@ -20,41 +16,38 @@ pipeline {
                     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 {
+                script {
-                   echo "building the application..."
+                    echo "building the application..."
-                   sh 'mvn clean package'
+                    sh 'mvn clean package'
-               }
+                }
             }
         }
         stage('build image') {
             steps {
                 script {
                     echo "building the docker image..."
-                    withCredentials([usernamePassword(credentialsId: 'ecr-credentials', passwordVariable: 'PASS', usernameVariable: 'USER')]) {
+                    withCredentials([usernamePassword(credentialsId: 'docker-hub', passwordVariable: 'PASS', usernameVariable: 'USER')]) {
-                        sh "docker build -t ${IMAGE_REPO}:${IMAGE_NAME} ."
+                        sh "docker build -t nanajanashia/demo-app:${IMAGE_NAME} ."
-                        sh "echo $PASS | docker login -u $USER --password-stdin ${ECR_REPO_URL}"
+                        sh "echo $PASS | docker login -u $USER --password-stdin"
-                        sh "docker push ${IMAGE_REPO}:${IMAGE_NAME}"
+                        sh "docker push nanajanashia/demo-app:${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...'
+                    withKubeConfig([credentialsId: 'k8s-credentials', serverUrl: 'https://7293fae4-4c9d-4629-bc82-262d0a2b8e3c.eu-central-2.linodelke.net']) {
-                    sh 'envsubst < kubernetes/deployment.yaml | kubectl apply -f -'
+                        withCredentials([usernamePassword(credentialsId: 'docker-hub', passwordVariable: 'PASS', usernameVariable: 'USER')]) {
-                    sh 'envsubst < kubernetes/service.yaml | kubectl apply -f -'
+                            sh "kubectl create secret docker-registry my-registry-key --docker-server=docker.io --docker-username=$USER --docker-password=$PASS"
+                        }
+                        sh 'envsubst < kubernetes/deployment.yaml | kubectl apply -f -'
+                    }
                 }
             }
         }
@@ -62,8 +55,10 @@ pipeline {
             steps {
                 script {
                     withCredentials([usernamePassword(credentialsId: 'gitlab-credentials', passwordVariable: 'PASS', usernameVariable: 'USER')]) {
-                        sh 'git config user.email "jenkins@example.com"'
+                        // git config here for the first time run
-                        sh 'git config user.name "Jenkins"'
+                        sh 'git config --global user.email "jenkins@example.com"'
+                        sh 'git config --global 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"'

kubernetes/deployment.yaml

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

kubernetes/service.yaml

@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: $APP_NAME
+  name: java-maven-app
 spec:
   selector:
-    app: $APP_NAME
+    app: java-maven-app
   ports:
     - protocol: TCP
       port: 80

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.example</groupId>
     <artifactId>java-maven-app</artifactId>
-    <version>1.1.5</version>
+    <version>1.1.0-SNAPSHOT</version>
 
     <build>
         <plugins>

script.groovy

@@ -0,0 +1,19 @@
+def buildJar() {
+    echo "building the application..."
+    sh 'mvn package'
+} 
+
+def buildImage() {
+    echo "building the docker image..."
+    withCredentials([usernamePassword(credentialsId: 'docker-hub-repo', passwordVariable: 'PASS', usernameVariable: 'USER')]) {
+        sh 'docker build -t nanajanashia/demo-app:jma-2.0 .'
+        sh "echo $PASS | docker login -u $USER --password-stdin"
+        sh 'docker push nanajanashia/demo-app:jma-2.0'
+    }
+} 
+
+def deployApp() {
+    echo 'deploying the application...'
+} 
+
+return this

src/main/resources/static/index.html

@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>MyApp</title>
-</head>
-<body>
-<h1>Welcome to Java Maven Application</h1>
-<!-- add image here  <img src="" width="" /> -->
-</body>
-</html>

src/test/java/AppTest.java

@@ -1,16 +0,0 @@
-import com.example.Application;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class AppTest {
-
-    @Test
-    public void testApp() {
-        Application myApp = new Application();
-
-        String result = myApp.getStatus();
-
-        assertEquals("OK", result);
-    }
-
-}

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>