Добавлен сборочный контейнер
This commit is contained in:
@@ -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 {
|
||||
|
||||
@@ -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
|
||||
|
||||
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
|
||||
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
|
||||
|
||||
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
|
||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user