Skip to content

Commit

Permalink
fix contianer deployment adn quarkus bug (#77)
Browse files Browse the repository at this point in the history
Signed-off-by: Nicklas Körtge <[email protected]>
  • Loading branch information
n1ckl0sk0rtge authored Nov 21, 2024
1 parent 80dfc6f commit 416358b
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 159 deletions.
13 changes: 8 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,14 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-config-yaml</artifactId>
</dependency>

<!-- Fixes error with quarkus 3.16.4 -->
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.33</version>
</dependency>

<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-hibernate-orm-panache</artifactId>
Expand Down Expand Up @@ -126,11 +134,6 @@
<artifactId>quarkus-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-panache-mock</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
Expand Down
9 changes: 5 additions & 4 deletions src/main/docker/Dockerfile.jvm
Original file line number Diff line number Diff line change
Expand Up @@ -81,17 +81,18 @@ FROM registry.access.redhat.com/ubi8/openjdk-21:1.20

ENV LANGUAGE='en_US:en'


# We make four distinct layers so if there are application changes the library layers can be re-used
COPY --chown=185 target/quarkus-app/lib/ /deployments/lib/
COPY --chown=185 target/quarkus-app/*.jar /deployments/
COPY --chown=185 target/quarkus-app/app/ /deployments/app/
COPY --chown=185 target/quarkus-app/quarkus/ /deployments/quarkus/
# copy the crypto lib dependecies for java into the image
COPY --chown=185 src/main/resources/java/scan/*.jar /deployments/java/scan/

EXPOSE 8080
USER 185
ENV JAVA_OPTS_APPEND="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
ENV CBOMKIT_JAVA_JAR_DIR="/deployments/java/scan/"
ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Xmx16g"
ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"

ENTRYPOINT [ "/opt/jboss/container/java/run/run-java.sh" ]

ENTRYPOINT [ "/opt/jboss/container/java/run/run-java.sh" ]
93 changes: 0 additions & 93 deletions src/main/docker/Dockerfile.legacy-jar

This file was deleted.

27 changes: 0 additions & 27 deletions src/main/docker/Dockerfile.native

This file was deleted.

30 changes: 0 additions & 30 deletions src/main/docker/Dockerfile.native-micro

This file was deleted.

Binary file not shown.

0 comments on commit 416358b

Please sign in to comment.