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