Compare commits

..

No commits in common. "eef6b981712f1befed9e9ac7c0633b70f783678a" and "d87af982f7db8d2e288024f3d48535a70bf866f0" have entirely different histories.

2 changed files with 7 additions and 7 deletions

View file

@ -1,5 +1,5 @@
# Stage 1: Build bot # Stage 1: Build bot
FROM docker.io/maven:3.9-eclipse-temurin-20 AS maven FROM docker.io/maven:3.9-eclipse-temurin-19 AS maven
WORKDIR /app WORKDIR /app
# Copy the dependency specifications # Copy the dependency specifications
COPY pom.xml . COPY pom.xml .
@ -9,7 +9,7 @@ COPY migration/pom.xml migration/
COPY web/pom.xml web/ COPY web/pom.xml web/
# Adding default Maven arguments # Adding default Maven arguments
ENV MAVEN_CLI_OPTS="--batch-mode --no-transfer-progress -Dmaven.test.skip" ENV MAVEN_CLI_OPTS="--batch-mode --no-transfer-progress"
# Resolve dependencies for shared libraries # Resolve dependencies for shared libraries
RUN mvn $MAVEN_CLI_OPTS -pl db -am dependency:go-offline RUN mvn $MAVEN_CLI_OPTS -pl db -am dependency:go-offline
@ -28,20 +28,20 @@ COPY migration migration
RUN mvn $MAVEN_CLI_OPTS -pl migration package RUN mvn $MAVEN_CLI_OPTS -pl migration package
# Stage 2: Create final web # Stage 2: Create final web
FROM docker.io/eclipse-temurin:20-jdk-jammy AS web FROM docker.io/eclipse-temurin:19-jdk-jammy AS web
WORKDIR /app WORKDIR /app
COPY --from=maven /app/web/target/web-*-fat.jar /app/web.jar COPY --from=maven /app/web/target/web-*-fat.jar /app/web.jar
EXPOSE 8080 EXPOSE 8080
CMD ["java", "-jar", "/app/web.jar"] CMD ["java", "-jar", "/app/web.jar"]
# Stage 2: Create final migration # Stage 2: Create final migration
FROM docker.io/eclipse-temurin:20-jdk-jammy AS migration FROM docker.io/eclipse-temurin:19-jdk-jammy AS migration
WORKDIR /app WORKDIR /app
COPY --from=maven /app/migration/target/migration-*-fat.jar /app/migration.jar COPY --from=maven /app/migration/target/migration-*-fat.jar /app/migration.jar
CMD ["java", "-jar", "/app/migration.jar"] CMD ["java", "-jar", "/app/migration.jar"]
# Stage 2: Create final bot # Stage 2: Create final bot
FROM docker.io/eclipse-temurin:20-jdk-jammy AS bot FROM docker.io/eclipse-temurin:19-jdk-jammy AS bot
WORKDIR /app WORKDIR /app
COPY --from=maven /app/bot/target/bot-*-fat.jar /app/bot.jar COPY --from=maven /app/bot/target/bot-*-fat.jar /app/bot.jar
CMD ["java", "-jar", "/app/bot.jar"] CMD ["java", "-jar", "/app/bot.jar"]

View file

@ -27,8 +27,8 @@
</licenses> </licenses>
<properties> <properties>
<maven.compiler.source>20</maven.compiler.source> <maven.compiler.source>19</maven.compiler.source>
<maven.compiler.target>20</maven.compiler.target> <maven.compiler.target>19</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jackson.version>2.15.1</jackson.version> <jackson.version>2.15.1</jackson.version>
</properties> </properties>