From 13b798f1fb5a8f8be2f3fc5448759b39b8f680c8 Mon Sep 17 00:00:00 2001
From: Szakalakamaka <rafzukow@gmail.com>
Date: Mon, 28 Sep 2020 11:21:43 +0200
Subject: [PATCH] testing jenkins docker

---
 .idea/workspace.xml                           | 15 +++++++++---
 Dockerfile                                    |  5 ++--
 pom.xml                                       | 24 -------------------
 .../java/com/release11/klaus/model/Event.java |  2 --
 4 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b5483e5..d832285 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -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>
diff --git a/Dockerfile b/Dockerfile
index f0d0c7d..bf63838 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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}
 
diff --git a/pom.xml b/pom.xml
index 7277fed..1f25c54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
 
diff --git a/src/main/java/com/release11/klaus/model/Event.java b/src/main/java/com/release11/klaus/model/Event.java
index a453453..6c820f4 100644
--- a/src/main/java/com/release11/klaus/model/Event.java
+++ b/src/main/java/com/release11/klaus/model/Event.java
@@ -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