Skip to content

Commit

Permalink
upgrade to vertx 4.4.6 and jdk-21 lts for the container image
Browse files Browse the repository at this point in the history
  • Loading branch information
zyclonite committed Nov 1, 2023
1 parent 2163165 commit f6b51e3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM maven:3.9.4-eclipse-temurin-17 as maven
FROM maven:3.9.5-eclipse-temurin-21 as maven

WORKDIR /src

Expand All @@ -9,18 +9,18 @@ RUN /opt/java/openjdk/bin/jlink \
--no-man-pages \
--add-modules java.base,java.naming,java.management,java.logging,java.sql,java.xml,java.compiler,jdk.naming.dns,jdk.unsupported \
--compress 2 \
--output /opt/java/openjdk-17-slim
--output /opt/java/openjdk-21-slim

FROM debian:bullseye-slim
FROM ubuntu:jammy

ENV JAVA_HOME /usr/local/openjdk-17
ENV JAVA_HOME /usr/local/openjdk-21
ENV PATH $JAVA_HOME/bin:$PATH
ENV LANG C.UTF-8

WORKDIR /opt

COPY --from=maven --chown=nobody:nogroup /src/src/docker/* /src/target/nassh-relay-app.jar /opt/
COPY --from=maven /opt/java/openjdk-17-slim /usr/local/openjdk-17
COPY --from=maven /opt/java/openjdk-21-slim /usr/local/openjdk-21

USER nobody

Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>net.zyclonite.nassh</groupId>
<artifactId>nassh-relay</artifactId>
<version>1.1.31</version>
<version>1.1.32</version>

<organization>
<name>zyclonite networx</name>
Expand All @@ -19,8 +19,8 @@
</developers>

<properties>
<vertx.version>4.4.5</vertx.version>
<log4j2.version>2.20.0</log4j2.version>
<vertx.version>4.4.6</vertx.version>
<log4j2.version>2.21.1</log4j2.version>
<vertx.main>${project.groupId}.MainVerticle</vertx.main>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand Down

0 comments on commit f6b51e3

Please sign in to comment.