Add simple UI

Update Jenkinsfile
add kubectl deploy step
2021-07-12 12:32:27 +02:00 · 2021-01-04 10:14:43 +00:00 · 2020-12-04 19:11:10 +01:00 · 2020-12-04 19:00:41 +01:00 · 2020-12-04 16:46:59 +01:00 · 2020-12-04 16:22:34 +01:00
16 changed files with 59 additions and 93 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .idea/*
+target
--- a/4
+++ b/4
@@ -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
--- a/37
+++ b/37
@@ -1,52 +1,31 @@
 #!/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('build app') {
            steps {
               script {
-                  echo 'building application jar...'
-                  buildJar()
+                   echo "building the application..."
               }
            }
        }
        stage('build image') {
            steps {
                script {
-                   echo 'building docker image...'
-                   buildImage(env.IMAGE_NAME)
-                   dockerLogin()
-                   dockerPush(env.IMAGE_NAME)
+                    echo "building the docker image..."
                }
            }
        }
        stage('deploy') {
+            environment {
+               AWS_ACCESS_KEY_ID = credentials('jenkins_aws_access_key_id')
+               AWS_SECRET_ACCESS_KEY = credentials('jenkins_aws_secret_access_key')
+            }
            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}"
-                   }
+                   echo 'deploying docker image...'
+                   sh 'kubectl create deployment nginx-deployment --image=nginx'
                }
            }
        }
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -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
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@

    <groupId>com.example</groupId>
    <artifactId>java-maven-app</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.1.4</version>

    <build>
        <plugins>
--- a/server-cmds.sh
+++ b/server-cmds.sh
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-export IMAGE=$1
-docker-compose -f docker-compose.yaml up --detach
-echo "success"
--- a/src/main/resources/static/index.html
+++ b/src/main/resources/static/index.html
@@ -0,0 +1,11 @@
+<!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>
--- a/target/java-maven-app-1.0-SNAPSHOT.jar
+++ b/target/java-maven-app-1.0-SNAPSHOT.jar
--- 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
+#Sun Nov 29 08:01:35 UTC 2020
+version=1.1.4
 groupId=com.example
 artifactId=java-maven-app
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -1 +0,0 @@
-com/example/Application.class
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -1 +0,0 @@
-/Users/nanajanashia/Demo-projects/Bootcamp/java-maven-app/src/main/java/com/example/Application.java
--- a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
@@ -1 +0,0 @@
-AppTest.class
--- a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
--- 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.096 sec
--- a/target/surefire-reports/TEST-AppTest.xml
+++ b/target/surefire-reports/TEST-AppTest.xml
@@ -1,69 +1,64 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite tests="1" failures="0" name="AppTest" time="0.003" errors="0" skipped="0">
+<testsuite tests="1" failures="0" name="AppTest" time="0.01" errors="0" skipped="0">
  <properties>
-    <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
-    <property name="sun.boot.library.path" value="/Library/Java/JavaVirtualMachines/jdk1.8.0_202.jdk/Contents/Home/jre/lib"/>
-    <property name="java.vm.version" value="25.202-b08"/>
-    <property name="user.country.format" value="AT"/>
-    <property name="gopherProxySet" value="false"/>
+    <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="/Users/nanajanashia/Demo-projects/Bootcamp/java-maven-app"/>
+    <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="Java HotSpot(TM) 64-Bit Server VM"/>
+    <property name="java.vm.name" value="OpenJDK 64-Bit Server VM"/>
    <property name="file.encoding.pkg" value="sun.io"/>
-    <property name="user.country" value="GB"/>
    <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="/Users/nanajanashia/Demo-projects/Bootcamp/java-maven-app"/>
-    <property name="java.runtime.version" value="1.8.0_202-b08"/>
-    <property name="java.awt.graphicsenv" value="sun.awt.CGraphicsEnvironment"/>
-    <property name="java.endorsed.dirs" value="/Library/Java/JavaVirtualMachines/jdk1.8.0_202.jdk/Contents/Home/jre/lib/endorsed"/>
-    <property name="os.arch" value="x86_64"/>
-    <property name="java.io.tmpdir" value="/var/folders/y3/bvgmrxg950x0f1z4zt3pby3c0000gn/T/"/>
+    <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="Mac OS X"/>
-    <property name="classworlds.conf" value="/usr/local/Cellar/maven/3.6.0/libexec/bin/m2.conf"/>
+    <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="/Users/nanajanashia/Library/Java/Extensions:/Library/Java/Extensions:/Network/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java:."/>
-    <property name="maven.conf" value="/usr/local/Cellar/maven/3.6.0/libexec/conf"/>
+    <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="10.14.6"/>
-    <property name="library.jansi.path" value="/usr/local/Cellar/maven/3.6.0/libexec/lib/jansi-native"/>
-    <property name="http.nonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
-    <property name="user.home" value="/Users/nanajanashia"/>
-    <property name="user.timezone" value="Europe/Vienna"/>
-    <property name="java.awt.printerjob" value="sun.lwawt.macosx.CPrinterJob"/>
+    <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="nanajanashia"/>
-    <property name="java.class.path" value="/usr/local/Cellar/maven/3.6.0/libexec/boot/plexus-classworlds-2.5.2.jar"/>
+    <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="/Library/Java/JavaVirtualMachines/jdk1.8.0_202.jdk/Contents/Home/jre"/>
-    <property name="sun.java.command" value="org.codehaus.plexus.classworlds.launcher.Launcher test"/>
+    <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.lwawt.macosx.LWCToolkit"/>
+    <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_202"/>
-    <property name="java.ext.dirs" value="/Users/nanajanashia/Library/Java/Extensions:/Library/Java/JavaVirtualMachines/jdk1.8.0_202.jdk/Contents/Home/jre/lib/ext:/Library/Java/Extensions:/Network/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java"/>
-    <property name="sun.boot.class.path" value="/Library/Java/JavaVirtualMachines/jdk1.8.0_202.jdk/Contents/Home/jre/lib/resources.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_202.jdk/Contents/Home/jre/lib/rt.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_202.jdk/Contents/Home/jre/lib/sunrsasign.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_202.jdk/Contents/Home/jre/lib/jsse.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_202.jdk/Contents/Home/jre/lib/jce.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_202.jdk/Contents/Home/jre/lib/charsets.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_202.jdk/Contents/Home/jre/lib/jfr.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_202.jdk/Contents/Home/jre/classes"/>
+    <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="/usr/local/Cellar/maven/3.6.0/libexec"/>
+    <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="UnicodeBig"/>
-    <property name="socksNonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
-    <property name="ftp.nonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
+    <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
    <property name="sun.cpu.isalist" value=""/>
  </properties>
-  <testcase classname="AppTest" name="testApp" time="0.003"/>
+  <testcase classname="AppTest" name="testApp" time="0.01"/>
 </testsuite>
--- a/target/test-classes/AppTest.class
+++ b/target/test-classes/AppTest.class
Author	SHA1	Message	Date
Nana Janashia	31ae1c5153	Add simple UI	2021-07-12 12:32:27 +02:00
Nana Janashia	b128506eec	Update Jenkinsfile	2021-01-04 10:14:43 +00:00
Nana Janashia	0a40971e52	add kubectl deploy step	2020-12-04 19:11:10 +01:00
Nana Janashia	ba11b6ecc8	revert	2020-12-04 19:00:41 +01:00
Nana Janashia	127fe8818c	add kubectl create	2020-12-04 16:46:59 +01:00
Nana Janashia	322a9fb1b9	add new feature	2020-12-04 16:22:34 +01:00
jenkins	d2bb88b269	ci: version bump	2020-11-29 08:01:53 +00:00
Nana Janashia	14af7f6928	removed target folder from repo and ignored	2020-11-29 09:00:54 +01:00
jenkins	0f16440c51	ci: version bump	2020-11-29 07:50:50 +00:00
jenkins	9e0883d626	ci: version bump	2020-11-29 07:50:06 +00:00
Nana Janashia	ad517593dd	cleanup git push from Jenkinn	2020-11-29 08:49:01 +01:00
jenkins	96a0f80bec	ci: version bump	2020-11-29 07:31:41 +00:00
Nana Janashia	0972181e49	add git push from Jenkins	2020-11-29 08:30:24 +01:00
Nana Janashia	a24c7c6f15	revert jenkins git commit	2020-11-28 19:18:40 +01:00
Nana Janashia	0907a4a9f6	fix next incr version	2020-11-28 15:03:50 +01:00
Nana Janashia	7e3d309037	fix next incr version	2020-11-28 15:02:21 +01:00
Nana Janashia	f83a7744b9	fix env var	2020-11-28 14:57:13 +01:00
Nana Janashia	d8a20f2ac9	Configure version increment in build	2020-11-28 14:51:17 +01:00
Nana Janashia	ab509b3b3c	add patch version to maven version	2020-11-28 11:19:23 +01:00
				`@@ -1 +0,0 @@`
				`/Users/nanajanashia/Demo-projects/Bootcamp/java-maven-app/src/main/java/com/example/Application.java`