diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 10350a5..ed29875 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -22,12 +22,7 @@
-
-
-
-
-
-
+
@@ -515,7 +510,14 @@
1601021813429
-
+
+ 1601278297201
+
+
+
+ 1601278297201
+
+
@@ -535,7 +537,6 @@
-
@@ -560,7 +561,8 @@
-
+
+
@@ -658,13 +660,13 @@
-
+
-
+
diff --git a/Dockerfile b/Dockerfile
index 6a59321..ccf893e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,17 @@
-FROM openjdk:14-alpine as builder
-RUN apk add --no-cache maven
-WORKDIR /usr/app/klaus
-COPY ./ ./
-RUN mvn --version
-RUN mvn clean install -B
-CMD mvn spring-boot:run
\ No newline at end of file
+FROM openjdk:14-jre-slim 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
+LABEL PROJECT_NAME=${project.artifactId} \
+ PROJECT=${project.id}
+
+EXPOSE 8080
+
+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/ ./
+ENTRYPOINT["java", "-Djava.security.cgd=file:/dev/./urandom", "org.springframework.boot.loader.JarLauncher"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 86f84ea..40658b9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,9 @@ services:
restart: "no"
klaus:
restart: "no"
- build: Dockerfile
+ build:
+ context: .
+ dockerfile: Dockerfile
ports:
- "8097:8097"
depends_on:
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
deleted file mode 100644
index ccf893e..0000000
--- a/src/main/docker/Dockerfile
+++ /dev/null
@@ -1,17 +0,0 @@
-FROM openjdk:14-jre-slim 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
-LABEL PROJECT_NAME=${project.artifactId} \
- PROJECT=${project.id}
-
-EXPOSE 8080
-
-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/ ./
-ENTRYPOINT["java", "-Djava.security.cgd=file:/dev/./urandom", "org.springframework.boot.loader.JarLauncher"]
diff --git a/src/main/docker/docker-compose.yml b/src/main/docker/docker-compose.yml
deleted file mode 100644
index 40658b9..0000000
--- a/src/main/docker/docker-compose.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-version: '3'
-services:
- redis-server:
- image: 'redis'
- restart: "no"
- klaus:
- restart: "no"
- build:
- context: .
- dockerfile: Dockerfile
- ports:
- - "8097:8097"
- depends_on:
- - redis-server