Merge pull request #14605 from geoand/#14565

Make some AppCDS adjustments
quarkusio · Jan 26, 2021 · 7139b30 · 7139b30
2 parents 6476140 + d87dbbe
commit 7139b30
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/AppCDSBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/AppCDSBuildStep.java
@@ -148,7 +148,7 @@ private Path createClassesLst(PackageConfig packageConfig, JarBuildItem jarResul
     private Path createAppCDS(JarBuildItem jarResult, String javaBin,
             Path classesLstPath, boolean isFastFar) {
 
-        Path workingDirectory = isFastFar ? jarResult.getPath().getParent().getParent() : jarResult.getPath().getParent();
+        Path workingDirectory = jarResult.getPath().getParent();
         Path appCDSPath = workingDirectory.resolve("app-cds.jsa");
         if (appCDSPath.toFile().exists()) {
             try {

diff --git a/...eployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerProcessor.java b/...eployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerProcessor.java
@@ -34,6 +34,7 @@
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.CapabilityBuildItem;
 import io.quarkus.deployment.pkg.PackageConfig;
+import io.quarkus.deployment.pkg.builditem.AppCDSResultBuildItem;
 import io.quarkus.deployment.pkg.builditem.ArtifactResultBuildItem;
 import io.quarkus.deployment.pkg.builditem.JarBuildItem;
 import io.quarkus.deployment.pkg.builditem.NativeImageBuildItem;
@@ -70,9 +71,10 @@ public void dockerBuildFromJar(DockerConfig dockerConfig,
             ContainerImageInfoBuildItem containerImageInfo,
             Optional<ContainerImageBuildRequestBuildItem> buildRequest,
             Optional<ContainerImagePushRequestBuildItem> pushRequest,
+            @SuppressWarnings("unused") Optional<AppCDSResultBuildItem> appCDSResult, // ensure docker build will be performed after AppCDS creation 
             BuildProducer<ArtifactResultBuildItem> artifactResultProducer,
             PackageConfig packageConfig,
-            // used to ensure that the jar has been built
+            @SuppressWarnings("unused") // used to ensure that the jar has been built
             JarBuildItem jar) {
 
         if (!containerImageConfig.build && !containerImageConfig.push && !buildRequest.isPresent()