Compare commits
64 Commits
bugfix/jen
...
feature/je
| Author | SHA1 | Date | |
|---|---|---|---|
|
dd21d95e93 | ||
|
|
9492a348d0 | ||
|
|
a87e8850de | ||
|
|
6123875bc8 | ||
|
|
1f54931484 | ||
|
|
18ecdca204 | ||
|
|
e1dbd4d042 | ||
|
|
36b85d75cc | ||
|
|
c120554c74 | ||
|
|
3e1d99e8d0 | ||
|
|
e71aab1655 | ||
|
|
762a6a9ffb | ||
|
|
e14b7b7012 | ||
|
|
106a7e447e | ||
|
|
b28d6ff9d9 | ||
|
|
4e33b70b24 | ||
|
|
d41bcec12b | ||
|
|
9dadc24128 | ||
|
|
12f88937ab | ||
|
|
8b1aa75d8e | ||
|
|
339109ec86 | ||
|
|
63f6c3d5bb | ||
|
|
ba9f0882ca | ||
|
|
0b043899f9 | ||
|
|
f31394abe3 | ||
|
|
e2633b0888 | ||
|
|
a1b5946b6d | ||
|
|
45817d153a | ||
|
|
0576e0033b | ||
|
|
44cf4ac38c | ||
|
|
04f35ad918 | ||
|
|
686259038b | ||
|
|
1978bd1fc9 | ||
|
|
b262ce98c8 | ||
|
|
24fdad6aaa | ||
|
|
e41eb6433d | ||
|
|
1ce128d916 | ||
|
|
2c6295012f | ||
|
|
48b35c0308 | ||
|
|
80ed88f4be | ||
|
|
f8698fee42 | ||
|
|
eea2109d66 | ||
|
|
a71dd16df8 | ||
|
|
8e3382a0ef | ||
|
|
1d4aac4b5a | ||
|
|
f65d9eb00e | ||
|
|
a026af6e2f | ||
|
|
02aef32659 | ||
|
|
e68743b02d | ||
|
|
ce28529588 | ||
|
|
a0deb05e4e | ||
|
|
126336f79e | ||
|
|
19eeb818ca | ||
|
|
ff51c37f0a | ||
|
|
948fbb8f12 | ||
|
|
679d67b80a | ||
|
|
661a008faa | ||
|
|
9cc6d90fe8 | ||
|
|
61821c6ef7 | ||
|
|
1fa470771d | ||
|
|
9c56ddc553 | ||
|
|
056eca7cf6 | ||
|
|
e637047b84 | ||
|
|
845783dbc6 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1 +1,2 @@
|
|||||||
.idea/*
|
.idea/*
|
||||||
|
target
|
||||||
54
Jenkinsfile
vendored
Normal file
54
Jenkinsfile
vendored
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
#!/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()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
stage('build image') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
echo 'building docker image...'
|
||||||
|
buildImage(env.IMAGE_NAME)
|
||||||
|
dockerLogin()
|
||||||
|
dockerPush(env.IMAGE_NAME)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
stage('deploy') {
|
||||||
|
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 -o StrictHostKeyChecking=no server-cmds.sh ${ec2Instance}:/home/ec2-user"
|
||||||
|
sh "scp -o StrictHostKeyChecking=no docker-compose.yaml ${ec2Instance}:/home/ec2-user"
|
||||||
|
sh "ssh -o StrictHostKeyChecking=no ${ec2Instance} ${shellCmd}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
12
docker-compose.yaml
Normal file
12
docker-compose.yaml
Normal file
@@ -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
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# npm --version
|
|
||||||
# docker --version
|
|
||||||
21
pom.xml
21
pom.xml
@@ -8,6 +8,27 @@
|
|||||||
<artifactId>java-maven-app</artifactId>
|
<artifactId>java-maven-app</artifactId>
|
||||||
<version>1.0-SNAPSHOT</version>
|
<version>1.0-SNAPSHOT</version>
|
||||||
|
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||||
|
<version>2.3.5.RELEASE</version>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<goals>
|
||||||
|
<goal>repackage</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</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>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
|||||||
5
server-cmds.sh
Normal file
5
server-cmds.sh
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
export IMAGE=$1
|
||||||
|
docker-compose -f docker-compose.yaml up --detach
|
||||||
|
echo "success"
|
||||||
11
src/main/resources/static/index.html
Normal file
11
src/main/resources/static/index.html
Normal file
@@ -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>
|
||||||
Binary file not shown.
Binary file not shown.
@@ -1,5 +0,0 @@
|
|||||||
#Generated by Maven
|
|
||||||
#Thu Oct 29 12:55:55 CET 2020
|
|
||||||
version=1.0-SNAPSHOT
|
|
||||||
groupId=com.example
|
|
||||||
artifactId=java-maven-app
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
com/example/Application.class
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
/Users/nanajanashia/Demo-projects/Bootcamp/java-maven-app/src/main/java/com/example/Application.java
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
AppTest.class
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
-------------------------------------------------------------------------------
|
|
||||||
Test set: AppTest
|
|
||||||
-------------------------------------------------------------------------------
|
|
||||||
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.061 sec
|
|
||||||
@@ -1,69 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
|
||||||
<testsuite tests="1" failures="0" name="AppTest" time="0.003" 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.vm.vendor" value="Oracle Corporation"/>
|
|
||||||
<property name="maven.multiModuleProjectDirectory" value="/Users/nanajanashia/Demo-projects/Bootcamp/java-maven-app"/>
|
|
||||||
<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="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="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="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.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="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="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.specification.vendor" value="Oracle Corporation"/>
|
|
||||||
<property name="user.language" value="en"/>
|
|
||||||
<property name="awt.toolkit" value="sun.lwawt.macosx.LWCToolkit"/>
|
|
||||||
<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.vendor" value="Oracle Corporation"/>
|
|
||||||
<property name="maven.home" value="/usr/local/Cellar/maven/3.6.0/libexec"/>
|
|
||||||
<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.cpu.isalist" value=""/>
|
|
||||||
</properties>
|
|
||||||
<testcase classname="AppTest" name="testApp" time="0.003"/>
|
|
||||||
</testsuite>
|
|
||||||
Binary file not shown.
Reference in New Issue
Block a user