From 493e8cc30db4da2fb5a2b818eb4a250fe0690c65 Mon Sep 17 00:00:00 2001
From: Szakalakamaka <rafzukow@gmail.com>
Date: Tue, 29 Sep 2020 14:01:54 +0200
Subject: [PATCH] moving docker to a separate package

---
 .idea/workspace.xml                           | 20 +++++++++----------
 .../com/release11/klaus/docker/Dockerfile     |  2 +-
 .../release11/klaus/docker/docker-compose.yml |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)
 rename Dockerfile => src/main/java/com/release11/klaus/docker/Dockerfile (95%)
 rename docker-compose.yml => src/main/java/com/release11/klaus/docker/docker-compose.yml (86%)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3eb4bd6..83423db 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -197,13 +197,6 @@
       <option name="presentableId" value="Default" />
       <updated>1598862102028</updated>
     </task>
-    <task id="LOCAL-00018" summary="adding remove button for httpHeaders form">
-      <created>1599493271888</created>
-      <option name="number" value="00018" />
-      <option name="presentableId" value="LOCAL-00018" />
-      <option name="project" value="LOCAL" />
-      <updated>1599493271888</updated>
-    </task>
     <task id="LOCAL-00019" summary="fix for null headers">
       <created>1599550125788</created>
       <option name="number" value="00019" />
@@ -540,7 +533,14 @@
       <option name="project" value="LOCAL" />
       <updated>1601377932874</updated>
     </task>
-    <option name="localTasksCounter" value="67" />
+    <task id="LOCAL-00067" summary="jenkins - testing remote deploy">
+      <created>1601380234222</created>
+      <option name="number" value="00067" />
+      <option name="presentableId" value="LOCAL-00067" />
+      <option name="project" value="LOCAL" />
+      <updated>1601380234222</updated>
+    </task>
+    <option name="localTasksCounter" value="68" />
     <servers />
   </component>
   <component name="UnknownFeatures">
@@ -683,13 +683,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="1601377934553">
+    <state x="361" y="145" key="Vcs.Push.Dialog.v2" timestamp="1601380236110">
       <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="1601377934553" />
+    <state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824@0.0.1536.824" timestamp="1601380236110" />
     <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/src/main/java/com/release11/klaus/docker/Dockerfile
similarity index 95%
rename from Dockerfile
rename to src/main/java/com/release11/klaus/docker/Dockerfile
index f47e507..e8b1297 100644
--- a/Dockerfile
+++ b/src/main/java/com/release11/klaus/docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM maven:3.6.3-jdk-14 as builder
 WORKDIR application
-COPY ./ ./
+COPY ../../../../../../.. ./
 RUN mvn clean install
 
 FROM openjdk:14 as layerBuilder
diff --git a/docker-compose.yml b/src/main/java/com/release11/klaus/docker/docker-compose.yml
similarity index 86%
rename from docker-compose.yml
rename to src/main/java/com/release11/klaus/docker/docker-compose.yml
index f2d2725..3f54024 100644
--- a/docker-compose.yml
+++ b/src/main/java/com/release11/klaus/docker/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     restart: "no"
   klaus:
     build:
-      context: .
+      context: ../../../../../../..
       dockerfile: Dockerfile
     container_name: klaus
     restart: "no"