From c2c550881f762cf54b1ce9a36d6d102ef18bcbc9 Mon Sep 17 00:00:00 2001
From: serega6531 <S.Shkurov@bssys.com>
Date: Thu, 15 Oct 2020 01:48:34 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=20=D1=81=D0=B1=D0=BE=D1=80=D0=BE=D1=87=D0=BD=D1=8B=D0=B9?=
 =?UTF-8?q?=20=D0=BA=D0=BE=D0=BD=D1=82=D0=B5=D0=B9=D0=BD=D0=B5=D1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                             |  5 +---
 docker/Dockerfile_app                    | 32 +++++++++++-------------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 3 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1a5294a..57e79ba 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ apply plugin: 'io.spring.dependency-management'
 group = 'ru.serega6531'
 version = '1.0-SNAPSHOT'
 
-sourceCompatibility = JavaVersion.VERSION_14
+sourceCompatibility = JavaVersion.VERSION_14  // сменить на 15 после фикса https://github.com/rzwitserloot/lombok/issues/2579
 targetCompatibility = JavaVersion.VERSION_14
 
 configurations {
@@ -19,9 +19,6 @@ configurations {
 
 repositories {
     mavenCentral()
-
-    // удалить после выхода стабильной версии Java-WebSocket
-    maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
 }
 
 dependencies {
diff --git a/docker/Dockerfile_app b/docker/Dockerfile_app
index 81c66eb..36cee06 100644
--- a/docker/Dockerfile_app
+++ b/docker/Dockerfile_app
@@ -1,20 +1,16 @@
-FROM openjdk:15-ea-jdk-alpine
+FROM node:current-alpine
+WORKDIR /tmp/build/
+COPY ./frontend/ .
+RUN npm install && npm run build
 
-RUN apk --no-cache add libpcap npm
+FROM adoptopenjdk/openjdk15:alpine
+WORKDIR /tmp/compile/
+COPY ./ .
+COPY --from=0 /tmp/build/dist/ ./src/main/resources/static/
+RUN ./gradlew --no-daemon build -x test
 
-COPY ./ /app/
-
-WORKDIR /app/frontend/
-
-RUN npm install && npm run build && npm cache clean --force \
-    && mkdir -p ../src/main/resources/static/ \
-	&& mv ./dist/* ../src/main/resources/static/ \
-	&& rm -rf node_modules
-
-WORKDIR /app/
-
-RUN ./gradlew --no-daemon --no-build-cache build -x test \
-    && cp build/libs/packmate-*.jar app.jar \
-    && ./gradlew --no-daemon clean
-
-EXPOSE 65000:65000
+FROM adoptopenjdk/openjdk15:alpine-jre
+WORKDIR /app
+RUN apk --no-cache add libpcap
+COPY --from=1 /tmp/compile/build/libs/packmate-*.jar app.jar
+EXPOSE 65000:65000
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 622ab64..be52383 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists