Merge branch 'update-versions' into 'master'
Update versions See merge request packmate/Packmate!13
This commit is contained in:
@@ -8,8 +8,8 @@ apply plugin: 'io.spring.dependency-management'
|
||||
group = 'ru.serega6531'
|
||||
version = '1.0-SNAPSHOT'
|
||||
|
||||
sourceCompatibility = JavaVersion.VERSION_15
|
||||
targetCompatibility = JavaVersion.VERSION_15
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
||||
targetCompatibility = JavaVersion.VERSION_17
|
||||
|
||||
configurations {
|
||||
compileOnly {
|
||||
@@ -44,3 +44,7 @@ dependencies {
|
||||
annotationProcessor 'org.projectlombok:lombok'
|
||||
testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
|
||||
}
|
||||
|
||||
test {
|
||||
useJUnitPlatform()
|
||||
}
|
||||
@@ -1,16 +1,16 @@
|
||||
FROM node:17-alpine
|
||||
FROM node:19-alpine
|
||||
WORKDIR /tmp/build/
|
||||
COPY ./frontend/ .
|
||||
RUN export NODE_OPTIONS=--openssl-legacy-provider && npm install && npm run build
|
||||
|
||||
FROM adoptopenjdk/openjdk15:alpine
|
||||
FROM eclipse-temurin:17-jdk
|
||||
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
|
||||
FROM eclipse-temurin:17-jre
|
||||
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
|
||||
EXPOSE 65000:65000
|
||||
EXPOSE 65000
|
||||
@@ -1,4 +1,4 @@
|
||||
FROM postgres:14.1-alpine
|
||||
FROM postgres:15.1
|
||||
|
||||
ARG POSTGRES_USER
|
||||
ARG POSTGRES_PASSWORD
|
||||
@@ -11,4 +11,4 @@ ENV POSTGRES_DB ${POSTGRES_DB}
|
||||
COPY docker/postgresql.conf /tmp/postgresql.conf
|
||||
COPY docker/update_db_config.sh /docker-entrypoint-initdb.d/_update_db_config.sh
|
||||
|
||||
EXPOSE 65001:65001
|
||||
EXPOSE 65001
|
||||
|
||||
2
frontend
2
frontend
Submodule frontend updated: b5d3074f76...cfdfc9e578
Reference in New Issue
Block a user