bug: copy layers into final crac image

For some reason, we are no longer copying the libs and resources into the final CRaC image. This PR remedies that
micronaut-projects · Feb 29, 2024 · 59a9c71 · 59a9c71
1 parent 9645605
commit 59a9c71
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/crac-plugin/src/main/java/io/micronaut/gradle/crac/MicronautCRaCPlugin.java b/crac-plugin/src/main/java/io/micronaut/gradle/crac/MicronautCRaCPlugin.java
@@ -272,6 +272,7 @@ private Optional<TaskProvider<CRaCFinalDockerfile>> configureFinalDockerBuild(Pr
             task.getBaseImage().set(configuration.getBaseImage());
             task.getPlatform().set(configuration.getPlatform());
             task.getArgs().set(configuration.getFinalArgs());
+            task.getLayers().convention(buildLayersTask.flatMap(BuildLayersTask::getLayers));
             task.setupDockerfileInstructions();
         });
         @SuppressWarnings("java:S1604") // Needs to be an anonymous action for cache config serialization

diff --git a/crac-plugin/src/test/groovy/io/micronaut/gradle/crac/CracBuildTaskSpec.groovy b/crac-plugin/src/test/groovy/io/micronaut/gradle/crac/CracBuildTaskSpec.groovy
@@ -71,6 +71,12 @@ netty:
         then:
         result.output.contains("Successfully tagged hello-world:latest")
         result.output.contains("CRaC checkpoint files may contain sensitive information.")
+        with(baseDir.resolve("build/docker/main/Dockerfile").text) {
+            contains("COPY --link layers/libs /home/app/libs")
+            contains("COPY --link layers/app /home/app")
+            contains("COPY --link layers/resources /home/app/resources")
+            contains("COPY --link scripts/run.sh /home/app/run.sh")
+        }
         task.outcome == TaskOutcome.SUCCESS
 
         where: