Merge pull request #38324 from geoand/#38320

Support using tars and docker daemon as base image for Jib
quarkusio · Jan 22, 2024 · 4f11fdf · 4f11fdf
2 parents 7aedf49 + a47821d
commit 4f11fdf
Showing 1 changed file with 22 additions and 9 deletions.
diff --git a/...-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java b/...-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java
@@ -365,6 +365,15 @@ private void doWriteOutputFile(OutputTargetBuildItem outputTarget, Path configPa
         }
     }
 
+    private JibContainerBuilder toJibContainerBuilder(String baseImage, ContainerImageJibConfig jibConfig)
+            throws InvalidImageReferenceException {
+        if (baseImage.startsWith(Jib.TAR_IMAGE_PREFIX) || baseImage.startsWith(Jib.DOCKER_DAEMON_IMAGE_PREFIX)) {
+            return Jib.from(baseImage);
+        }
+        return Jib.from(toRegistryImage(ImageReference.parse(baseImage), jibConfig.baseRegistryUsername,
+                jibConfig.baseRegistryPassword));
+    }
+
     private RegistryImage toRegistryImage(ImageReference imageReference, Optional<String> username, Optional<String> password) {
         CredentialRetrieverFactory credentialRetrieverFactory = CredentialRetrieverFactory.forImage(imageReference,
                 log::info);
@@ -519,9 +528,7 @@ private JibContainerBuilder createContainerBuilderFromFastJar(String baseJvmImag
             Instant now = Instant.now();
             Instant modificationTime = jibConfig.useCurrentTimestampFileModification ? now : Instant.EPOCH;
 
-            JibContainerBuilder jibContainerBuilder = Jib
-                    .from(toRegistryImage(ImageReference.parse(baseJvmImage), jibConfig.baseRegistryUsername,
-                            jibConfig.baseRegistryPassword));
+            JibContainerBuilder jibContainerBuilder = toJibContainerBuilder(baseJvmImage, jibConfig);
             if (fastChangingLibPaths.isEmpty()) {
                 // just create a layer with the entire lib structure intact
                 addLayer(jibContainerBuilder, Collections.singletonList(componentsPath.resolve(JarResultBuildStep.LIB)),
@@ -718,9 +725,17 @@ private JibContainerBuilder createContainerBuilderFromLegacyJar(String baseJvmIm
             // not ideal since this has been previously zipped - we would like to just reuse it
             Path classesDir = outputTargetBuildItem.getOutputDirectory().resolve("jib");
             ZipUtils.unzip(sourceJarBuildItem.getPath(), classesDir);
-            JavaContainerBuilder javaContainerBuilder = JavaContainerBuilder
-                    .from(toRegistryImage(ImageReference.parse(baseJvmImage), jibConfig.baseRegistryUsername,
-                            jibConfig.baseRegistryPassword))
+
+            JavaContainerBuilder javaContainerBuilder;
+            if (baseJvmImage.startsWith(Jib.TAR_IMAGE_PREFIX) || baseJvmImage.startsWith(Jib.DOCKER_DAEMON_IMAGE_PREFIX)) {
+                javaContainerBuilder = JavaContainerBuilder.from(baseJvmImage);
+            } else {
+                javaContainerBuilder = JavaContainerBuilder
+                        .from(toRegistryImage(ImageReference.parse(baseJvmImage), jibConfig.baseRegistryUsername,
+                                jibConfig.baseRegistryPassword));
+            }
+
+            javaContainerBuilder = javaContainerBuilder
                     .addResources(classesDir, IS_CLASS_PREDICATE.negate())
                     .addClasses(classesDir, IS_CLASS_PREDICATE);
 
@@ -778,9 +793,7 @@ private JibContainerBuilder createContainerBuilderFromNative(ContainerImageJibCo
         }
         try {
             AbsoluteUnixPath workDirInContainer = AbsoluteUnixPath.get("/work");
-            JibContainerBuilder jibContainerBuilder = Jib
-                    .from(toRegistryImage(ImageReference.parse(jibConfig.baseNativeImage), jibConfig.baseRegistryUsername,
-                            jibConfig.baseRegistryPassword))
+            JibContainerBuilder jibContainerBuilder = toJibContainerBuilder(jibConfig.baseNativeImage, jibConfig)
                     .addFileEntriesLayer(FileEntriesLayer.builder()
                             .addEntry(nativeImageBuildItem.getPath(), workDirInContainer.resolve(BINARY_NAME_IN_CONTAINER),
                                     FilePermissions.fromOctalString("775"))