R11/release11-tools-mocked-services
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

testing jenkins docker

Browse Source
This commit is contained in:
Szakalakamaka
2020-09-28 11:21:43 +02:00
parent 40aa87fd32
commit 13b798f1fb
4 changed files with 14 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
.idea/workspace.xml generated
View File

@@ -24,6 +24,8 @@
<component name="ChangeListManager">
<list default="true" id="458cde88-df3d-44bc-9d57-a33823e2f1a6" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Dockerfile" beforeDir="false" afterPath="$PROJECT_DIR$/Dockerfile" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/release11/klaus/model/Event.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/release11/klaus/model/Event.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -526,7 +528,14 @@
<option name="project" value="LOCAL" />
<updated>1601279502668</updated>
</task>
<option name="localTasksCounter" value="48" />
<task id="LOCAL-00048" summary="testing docker - jenkins">
<created>1601280355104</created>
<option name="number" value="00048" />
<option name="presentableId" value="LOCAL-00048" />
<option name="project" value="LOCAL" />
<updated>1601280355104</updated>
</task>
<option name="localTasksCounter" value="49" />
<servers />
</component>
<component name="UnknownFeatures">
@@ -669,13 +678,13 @@
</state>
<state x="277" y="57" key="SettingsEditor/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1600935670743" />
<state x="277" y="57" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1600868466042" />
<state x="361" y="145" key="Vcs.Push.Dialog.v2" timestamp="1601279504368">
<state x="361" y="145" key="Vcs.Push.Dialog.v2" timestamp="1601280357434">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="451" y="183" key="Vcs.Push.Dialog.v2/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275760386" />
<state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1600350277680" />
<state x="2371" y="183" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1600351824385" />
<state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824@0.0.1536.824" timestamp="1601279504368" />
<state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824@0.0.1536.824" timestamp="1601280357434" />
<state x="478" y="145" width="579" height="592" key="find.popup" timestamp="1599656923861">
<screen x="0" y="0" width="1536" height="824" />
</state>

5
Dockerfile
View File

@@ -1,9 +1,8 @@
FROM openjdk:14-jre-slim as builder
FROM openjdk:14 as builder
WORKDIR application
ADD maven/${project.build.finalName}.jar ${project.build.finalName}.jar
RUN java -Djarmode=layertools -jar ${project.build.finalName}.jar extract
FROM openjdk:14-jre-slim
FROM openjdk:14
LABEL PROJECT_NAME=${project.artifactId} \
PROJECT=${project.id}

24
pom.xml
View File

@@ -134,30 +134,6 @@
</compilerArgs>
</configuration>
</plugin>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.34.0</version>
<configuration>
<verbose>true</verbose>
<images>
<image>
<name>${docker.image.prefix}/${docker.image.name}</name>
<alias>${project.artifactId}</alias>
<build>
<assembly>
<descriptorRef>artifact</descriptorRef>
</assembly>
<dockerfile>Dockerfile</dockerfile>
<tags>
<tag>latest</tag>
<tag>${project.version}</tag>
</tags>
</build>
</image>
</images>
</configuration>
</plugin>
</plugins>
</build>

2
src/main/java/com/release11/klaus/model/Event.java
View File

@@ -26,5 +26,3 @@ public class Event {
@Nullable
private String message;
}
//{"date" : "%d{yyyy-MM-dd}", "timestamp":"%d{HH:mm:ss}", "businessKeys": {"interfaceName": "%X{interfaceName}",
// "clientUUID": "%X{clientUUID}", "messageId": "%X{messageId}"},"thread":"%t","level":"%-5level", "message":"%msg"}%n