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

---
 .idea/workspace.xml | 26 +++++++++++++++-----------
 Dockerfile          | 22 +++++++++++++---------
 Jenkinsfile         |  5 -----
 3 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 142d95a..944f110 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -22,7 +22,11 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="458cde88-df3d-44bc-9d57-a33823e2f1a6" name="Default Changelist" comment="" />
+    <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$/Jenkinsfile" beforeDir="false" afterPath="$PROJECT_DIR$/Jenkinsfile" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -195,13 +199,6 @@
       <option name="presentableId" value="Default" />
       <updated>1598862102028</updated>
     </task>
-    <task id="LOCAL-00003" summary="adding processes for history search&#10;adding custom redis appender">
-      <created>1598962802209</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1598962802209</updated>
-    </task>
     <task id="LOCAL-00004" summary="Adding logic for events">
       <created>1599036875005</created>
       <option name="number" value="00004" />
@@ -538,7 +535,14 @@
       <option name="project" value="LOCAL" />
       <updated>1601287462400</updated>
     </task>
-    <option name="localTasksCounter" value="52" />
+    <task id="LOCAL-00052" summary="testing jenkins docker">
+      <created>1601287668529</created>
+      <option name="number" value="00052" />
+      <option name="presentableId" value="LOCAL-00052" />
+      <option name="project" value="LOCAL" />
+      <updated>1601287668529</updated>
+    </task>
+    <option name="localTasksCounter" value="53" />
     <servers />
   </component>
   <component name="UnknownFeatures">
@@ -681,13 +685,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="1601287464000">
+    <state x="361" y="145" key="Vcs.Push.Dialog.v2" timestamp="1601287670071">
       <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="1601287464000" />
+    <state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824@0.0.1536.824" timestamp="1601287670071" />
     <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 77e2102..f47e507 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,18 @@
-FROM openjdk:14 as builder
+FROM maven:3.6.3-jdk-14 as builder
 WORKDIR application
-RUN java -Djarmode=layertools -jar ${project.build.finalName}.jar extract
+COPY ./ ./
+RUN mvn clean install
+
+FROM openjdk:14 as layerBuilder
+WORKDIR application
+ARG JAR_FILE=application/target/*.jar
+COPY --from=builder ${JAR_FILE} application.jar
+RUN java -Djarmode=layertools -jar application.jar extract
 
 FROM openjdk:14
-LABEL PROJECT_NAME=${project.artifactId} \
-      PROJECT=${project.id}
-
 WORKDIR application
-COPY --from=builder application/dependencies/ ./
-COPY --from=builder application/spring-boot-loader/ ./
-COPY --from=builder application/snapshot-dependencies/ ./
-COPY --from=builder application/application/ ./
+COPY --from=layerBuilder application/dependencies/ ./
+COPY --from=layerBuilder application/spring-boot-loader/ ./
+COPY --from=layerBuilder application/snapshot-dependencies/ ./
+COPY --from=layerBuilder application/application/ ./
 ENTRYPOINT ["java", "-Djava.security.cgd=file:/dev/./urandom", "org.springframework.boot.loader.JarLauncher"]
diff --git a/Jenkinsfile b/Jenkinsfile
index ff2e49a..790a007 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,11 +1,6 @@
 pipeline {
     agent any
     stages {
-      stage('build') {
-                  steps {
-                     sh "mvn clean package"
-                }
-            }
       stage('docker-compose') {
               steps {
                  sh "docker-compose build"