Merge pull request #13864 from stuartwdouglas/13629

Fast-jar does not deploy correctly to OpenShift
quarkusio · Dec 14, 2020 · 215c408 · 215c408
2 parents 642b505 + 245e895
commit 215c408
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/...ent/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftProcessor.java b/...ent/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftProcessor.java
@@ -238,9 +238,14 @@ public void openshiftBuildFromJar(OpenshiftConfig openshiftConfig,
         LOG.info("Performing openshift binary build with jar on server: " + kubernetesClient.getClient().getMasterUrl()
                 + " in namespace:" + namespace + ".");
 
-        createContainerImage(kubernetesClient, openshiftYml.get(), config, "target", out.getOutputDirectory(),
-                jar.getPath(),
-                out.getOutputDirectory().resolve("lib"));
+        if (packageConfig.isFastJar()) {
+            createContainerImage(kubernetesClient, openshiftYml.get(), config, "target", jar.getPath().getParent(),
+                    jar.getPath().getParent());
+        } else {
+            createContainerImage(kubernetesClient, openshiftYml.get(), config, "target", jar.getPath().getParent(),
+                    jar.getPath(),
+                    jar.getLibraryDir());
+        }
         artifactResultProducer.produce(new ArtifactResultBuildItem(null, "jar-container", Collections.emptyMap()));
     }