From 8f4889c9e247d8b992be0051918e888bdb848817 Mon Sep 17 00:00:00 2001 From: saber-nyan Date: Thu, 21 Nov 2019 01:01:30 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=B2=20Docker=20Gradle=20wrapper,=20=D0=B8=D0=B7=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=BB=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=20?= =?UTF-8?q?=D1=84=D1=80=D0=BE=D0=BD=D1=82=D0=B5=D0=BD=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile_app | 9 +++++---- frontend | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile_app b/Dockerfile_app index 0c45d19..66f009b 100644 --- a/Dockerfile_app +++ b/Dockerfile_app @@ -1,18 +1,19 @@ FROM openjdk:8-jdk-alpine -RUN apk add gradle libpcap npm +RUN apk add libpcap npm COPY ./ /app/ -WORKDIR /app/frontend +WORKDIR /app/frontend/ RUN npm install && npm run build -RUN cp -rf ./dist/* ../src/main/resources/static/ +RUN mkdir -p ../src/main/resources/static/ \ + && cp -rf ./dist/* ../src/main/resources/static/ WORKDIR /app/ -RUN gradle --no-daemon build +RUN ./gradlew --no-daemon build RUN cp build/libs/packmate-*.jar app.jar diff --git a/frontend b/frontend index b8c21d3..b89fad9 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit b8c21d3a8620725c9212a63930744109ed95552c +Subproject commit b89fad9502212c78ea3514854ff56a7f87ecfdb1