Merge branch 'master' into code-cleanup

micronaut-projects · Jan 10, 2025 · 1c2f4aa · 1c2f4aa
2 parents 2287c65 + 0991ff0
commit 1c2f4aa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/functional-tests/src/test/groovy/io/micronaut/gradle/aot/MicronautAOTDockerSpec.groovy b/functional-tests/src/test/groovy/io/micronaut/gradle/aot/MicronautAOTDockerSpec.groovy
@@ -74,9 +74,11 @@ ENTRYPOINT ["java", "-jar", "/home/app/application.jar"]
             RUN mkdir /home/app/config-dirs
             RUN mkdir -p /home/app/config-dirs/generateResourcesConfigFile
             RUN mkdir -p /home/app/config-dirs/io.netty/netty-common/4.0.0.Final
+            RUN mkdir -p /home/app/config-dirs/io.netty/netty-transport/4.0.0.Final
             RUN mkdir -p /home/app/config-dirs/ch.qos.logback/logback-classic/4.0.0
             COPY --link config-dirs/generateResourcesConfigFile /home/app/config-dirs/generateResourcesConfigFile
             COPY --link config-dirs/io.netty/netty-common/4.0.0.Final /home/app/config-dirs/io.netty/netty-common/4.0.0.Final
+            COPY --link config-dirs/io.netty/netty-transport/4.0.0.Final /home/app/config-dirs/io.netty/netty-transport/4.0.0.Final
             COPY --link config-dirs/ch.qos.logback/logback-classic/4.0.0 /home/app/config-dirs/ch.qos.logback/logback-classic/4.0.0
             RUN native-image
             FROM cgr.dev/chainguard/wolfi-base:latest

diff --git a/...tional-tests/src/test/groovy/io/micronaut/gradle/docker/DockerNativeFunctionalTest.groovy b/...tional-tests/src/test/groovy/io/micronaut/gradle/docker/DockerNativeFunctionalTest.groovy
@@ -664,8 +664,10 @@ micronaut:
             RUN mkdir /home/alternate/config-dirs
             RUN mkdir -p /home/alternate/config-dirs/generateResourcesConfigFile
             RUN mkdir -p /home/alternate/config-dirs/io.netty/netty-common/4.0.0.Final
+            RUN mkdir -p /home/alternate/config-dirs/io.netty/netty-transport/4.0.0.Final
             COPY --link config-dirs/generateResourcesConfigFile /home/alternate/config-dirs/generateResourcesConfigFile
             COPY --link config-dirs/io.netty/netty-common/4.0.0.Final /home/alternate/config-dirs/io.netty/netty-common/4.0.0.Final
+            COPY --link config-dirs/io.netty/netty-transport/4.0.0.Final /home/alternate/config-dirs/io.netty/netty-transport/4.0.0.Final
             RUN native-image
             FROM cgr.dev/chainguard/wolfi-base:latest
             EXPOSE 8080