0xb00b5/0xb00b5-packmate
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update versions

Browse Source
This commit is contained in:
Sergey
2022-12-05 23:07:05 +00:00
parent ca58d29cb2
commit f57ecc74bc
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build.gradle
View File

@@ -8,8 +8,8 @@ apply plugin: 'io.spring.dependency-management'
group = 'ru.serega6531' group = 'ru.serega6531'
version = '1.0-SNAPSHOT' version = '1.0-SNAPSHOT'
sourceCompatibility = JavaVersion.VERSION_15 sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_15 targetCompatibility = JavaVersion.VERSION_17
configurations { configurations {
compileOnly { compileOnly {
@@ -44,3 +44,7 @@ dependencies {
annotationProcessor 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok'
testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2' testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
} }
test {
useJUnitPlatform()
}

10
docker/Dockerfile_app
View File

@@ -1,16 +1,16 @@
FROM node:17-alpine FROM node:19-alpine
WORKDIR /tmp/build/ WORKDIR /tmp/build/
COPY ./frontend/ . COPY ./frontend/ .
RUN export NODE_OPTIONS=--openssl-legacy-provider && npm install && npm run build RUN export NODE_OPTIONS=--openssl-legacy-provider && npm install && npm run build
FROM adoptopenjdk/openjdk15:alpine FROM eclipse-temurin:17-jdk
WORKDIR /tmp/compile/ WORKDIR /tmp/compile/
COPY ./ . COPY ./ .
COPY --from=0 /tmp/build/dist/ ./src/main/resources/static/ COPY --from=0 /tmp/build/dist/ ./src/main/resources/static/
RUN ./gradlew --no-daemon build -x test RUN ./gradlew --no-daemon build -x test
FROM adoptopenjdk/openjdk15:alpine-jre FROM eclipse-temurin:17-jre
WORKDIR /app WORKDIR /app
RUN apk --no-cache add libpcap RUN apt update && apt install -y libpcap0.8
COPY --from=1 /tmp/compile/build/libs/packmate-*-SNAPSHOT.jar app.jar COPY --from=1 /tmp/compile/build/libs/packmate-*-SNAPSHOT.jar app.jar
EXPOSE 65000:65000 EXPOSE 65000

4
docker/Dockerfile_db
View File

@@ -1,4 +1,4 @@
FROM postgres:14.1-alpine FROM postgres:15.1
ARG POSTGRES_USER ARG POSTGRES_USER
ARG POSTGRES_PASSWORD ARG POSTGRES_PASSWORD
@@ -11,4 +11,4 @@ ENV POSTGRES_DB ${POSTGRES_DB}
COPY docker/postgresql.conf /tmp/postgresql.conf COPY docker/postgresql.conf /tmp/postgresql.conf
COPY docker/update_db_config.sh /docker-entrypoint-initdb.d/_update_db_config.sh COPY docker/update_db_config.sh /docker-entrypoint-initdb.d/_update_db_config.sh
EXPOSE 65001:65001 EXPOSE 65001

2
frontend

Submodule frontend updated: b5d3074f76...cfdfc9e578