From 5994156ac4de8575b69ddb27dd0f09820f2c8764 Mon Sep 17 00:00:00 2001
From: Eric Deandrea <edeandrea@redhat.com>
Date: Tue, 21 May 2024 08:11:37 -0400
Subject: [PATCH] container-image-podman extension

---
 .../common/deployment/RedHatOpenJDKRuntimeBaseProvider.java   | 4 ++--
 .../docker/common/deployment/UbiMinimalBaseProvider.java      | 2 +-
 .../container-image/container-image-docker-common/pom.xml     | 4 +---
 .../container-image-docker-common/runtime/pom.xml             | 2 +-
 .../container-image-docker/deployment/pom.xml                 | 0
 .../container/image/docker/deployment/DockerBuild.java        | 0
 .../container/image/docker/deployment/DockerConfig.java       | 0
 .../container/image/docker/deployment/DockerProcessor.java    | 0
 .../container-image-docker/pom.xml                            | 2 +-
 .../container-image-docker/runtime/pom.xml                    | 0
 .../src/main/resources/META-INF/quarkus-extension.yaml        | 0
 .../container-image-podman/deployment/pom.xml                 | 0
 .../container/image/podman/deployment/PodmanBuild.java        | 0
 .../container/image/podman/deployment/PodmanConfig.java       | 0
 .../container/image/podman/deployment/PodmanProcessor.java    | 0
 .../container-image-podman/pom.xml                            | 2 +-
 .../container-image-podman/runtime/pom.xml                    | 0
 .../src/main/resources/META-INF/quarkus-extension.yaml        | 0
 extensions/container-image/pom.xml                            | 2 ++
 19 files changed, 9 insertions(+), 9 deletions(-)
 rename extensions/container-image/{container-image-docker-common => }/container-image-docker/deployment/pom.xml (100%)
 rename extensions/container-image/{container-image-docker-common => }/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerBuild.java (100%)
 rename extensions/container-image/{container-image-docker-common => }/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerConfig.java (100%)
 rename extensions/container-image/{container-image-docker-common => }/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerProcessor.java (100%)
 rename extensions/container-image/{container-image-docker-common => }/container-image-docker/pom.xml (89%)
 rename extensions/container-image/{container-image-docker-common => }/container-image-docker/runtime/pom.xml (100%)
 rename extensions/container-image/{container-image-docker-common => }/container-image-docker/runtime/src/main/resources/META-INF/quarkus-extension.yaml (100%)
 rename extensions/container-image/{container-image-docker-common => }/container-image-podman/deployment/pom.xml (100%)
 rename extensions/container-image/{container-image-docker-common => }/container-image-podman/deployment/src/main/java/io/quarkus/container/image/podman/deployment/PodmanBuild.java (100%)
 rename extensions/container-image/{container-image-docker-common => }/container-image-podman/deployment/src/main/java/io/quarkus/container/image/podman/deployment/PodmanConfig.java (100%)
 rename extensions/container-image/{container-image-docker-common => }/container-image-podman/deployment/src/main/java/io/quarkus/container/image/podman/deployment/PodmanProcessor.java (100%)
 rename extensions/container-image/{container-image-docker-common => }/container-image-podman/pom.xml (89%)
 rename extensions/container-image/{container-image-docker-common => }/container-image-podman/runtime/pom.xml (100%)
 rename extensions/container-image/{container-image-docker-common => }/container-image-podman/runtime/src/main/resources/META-INF/quarkus-extension.yaml (100%)

diff --git a/extensions/container-image/container-image-docker-common/deployment/src/main/java/io/quarkus/container/image/docker/common/deployment/RedHatOpenJDKRuntimeBaseProvider.java b/extensions/container-image/container-image-docker-common/deployment/src/main/java/io/quarkus/container/image/docker/common/deployment/RedHatOpenJDKRuntimeBaseProvider.java
index 2969aa5c5bd25a..0c15a1640a2457 100644
--- a/extensions/container-image/container-image-docker-common/deployment/src/main/java/io/quarkus/container/image/docker/common/deployment/RedHatOpenJDKRuntimeBaseProvider.java
+++ b/extensions/container-image/container-image-docker-common/deployment/src/main/java/io/quarkus/container/image/docker/common/deployment/RedHatOpenJDKRuntimeBaseProvider.java
@@ -9,7 +9,7 @@
 import java.util.stream.Stream;
 
 /**
- * Can extract information from Dockerfile that uses {@code registry.access.redhat.com/ubi[89]/openjdk-$d-runtime:$d.$d} as the
+ * Can extract information from Dockerfile that uses {@code registry.access.redhat.com/ubi8/openjdk-$d-runtime:$d.$d} as the
  * base image
  */
 class RedHatOpenJDKRuntimeBaseProvider implements DockerFileBaseInformationProvider {
@@ -21,7 +21,7 @@ public Optional<DockerFileBaseInformation> determine(Path dockerFile) {
             if (fromOpt.isPresent()) {
                 String fromLine = fromOpt.get();
                 String baseImage = fromLine.substring(4).trim();
-                Pattern pattern = Pattern.compile(".*ubi[89]/openjdk-(\\w+)-runtime.*");
+                Pattern pattern = Pattern.compile(".*ubi8/openjdk-(\\w+)-runtime.*");
                 Matcher matcher = pattern.matcher(baseImage);
                 if (matcher.find()) {
                     String match = matcher.group(1);
diff --git a/extensions/container-image/container-image-docker-common/deployment/src/main/java/io/quarkus/container/image/docker/common/deployment/UbiMinimalBaseProvider.java b/extensions/container-image/container-image-docker-common/deployment/src/main/java/io/quarkus/container/image/docker/common/deployment/UbiMinimalBaseProvider.java
index 7c9e8ce867ecf1..4ac17527960e39 100644
--- a/extensions/container-image/container-image-docker-common/deployment/src/main/java/io/quarkus/container/image/docker/common/deployment/UbiMinimalBaseProvider.java
+++ b/extensions/container-image/container-image-docker-common/deployment/src/main/java/io/quarkus/container/image/docker/common/deployment/UbiMinimalBaseProvider.java
@@ -11,7 +11,7 @@
 import java.util.stream.Stream;
 
 /**
- * Can extract information from Dockerfile that uses {@code registry.access.redhat.com/ubi[89]/ubi-minimal:$d.$d} as the
+ * Can extract information from Dockerfile that uses {@code registry.access.redhat.com/ubi8/ubi-minimal:$d.$d} as the
  * base image
  */
 class UbiMinimalBaseProvider implements DockerFileBaseInformationProvider {
diff --git a/extensions/container-image/container-image-docker-common/pom.xml b/extensions/container-image/container-image-docker-common/pom.xml
index f62431c5078dec..c115d50d4603d7 100644
--- a/extensions/container-image/container-image-docker-common/pom.xml
+++ b/extensions/container-image/container-image-docker-common/pom.xml
@@ -10,13 +10,11 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>quarkus-container-image-docker-common-parent</artifactId>
-    <name>Quarkus - Container Image - Docker - Common</name>
+    <name>Quarkus - Container Image - Docker Common - Parent</name>
     <packaging>pom</packaging>
     <modules>
         <module>deployment</module>
         <module>runtime</module>
-        <module>container-image-docker</module>
-        <module>container-image-podman</module>
     </modules>
 
 </project>
diff --git a/extensions/container-image/container-image-docker-common/runtime/pom.xml b/extensions/container-image/container-image-docker-common/runtime/pom.xml
index 3e50362dccd2d2..c7b6cebce33b9d 100644
--- a/extensions/container-image/container-image-docker-common/runtime/pom.xml
+++ b/extensions/container-image/container-image-docker-common/runtime/pom.xml
@@ -11,7 +11,7 @@
     </parent>
 
     <artifactId>quarkus-container-image-docker-common</artifactId>
-    <name>Quarkus - Container Image - Docker Common - Runtime</name>
+    <name>Quarkus - Container Image - Docker Common</name>
     <description>Build container images of your application using Docker APIs</description>
 
     <dependencies>
diff --git a/extensions/container-image/container-image-docker-common/container-image-docker/deployment/pom.xml b/extensions/container-image/container-image-docker/deployment/pom.xml
similarity index 100%
rename from extensions/container-image/container-image-docker-common/container-image-docker/deployment/pom.xml
rename to extensions/container-image/container-image-docker/deployment/pom.xml
diff --git a/extensions/container-image/container-image-docker-common/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerBuild.java b/extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerBuild.java
similarity index 100%
rename from extensions/container-image/container-image-docker-common/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerBuild.java
rename to extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerBuild.java
diff --git a/extensions/container-image/container-image-docker-common/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerConfig.java b/extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerConfig.java
similarity index 100%
rename from extensions/container-image/container-image-docker-common/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerConfig.java
rename to extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerConfig.java
diff --git a/extensions/container-image/container-image-docker-common/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerProcessor.java b/extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerProcessor.java
similarity index 100%
rename from extensions/container-image/container-image-docker-common/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerProcessor.java
rename to extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerProcessor.java
diff --git a/extensions/container-image/container-image-docker-common/container-image-docker/pom.xml b/extensions/container-image/container-image-docker/pom.xml
similarity index 89%
rename from extensions/container-image/container-image-docker-common/container-image-docker/pom.xml
rename to extensions/container-image/container-image-docker/pom.xml
index f71c93de934e8d..b3eab9c5d29090 100644
--- a/extensions/container-image/container-image-docker-common/container-image-docker/pom.xml
+++ b/extensions/container-image/container-image-docker/pom.xml
@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-container-image-docker-common-parent</artifactId>
+        <artifactId>quarkus-container-image-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
     </parent>
diff --git a/extensions/container-image/container-image-docker-common/container-image-docker/runtime/pom.xml b/extensions/container-image/container-image-docker/runtime/pom.xml
similarity index 100%
rename from extensions/container-image/container-image-docker-common/container-image-docker/runtime/pom.xml
rename to extensions/container-image/container-image-docker/runtime/pom.xml
diff --git a/extensions/container-image/container-image-docker-common/container-image-docker/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/container-image/container-image-docker/runtime/src/main/resources/META-INF/quarkus-extension.yaml
similarity index 100%
rename from extensions/container-image/container-image-docker-common/container-image-docker/runtime/src/main/resources/META-INF/quarkus-extension.yaml
rename to extensions/container-image/container-image-docker/runtime/src/main/resources/META-INF/quarkus-extension.yaml
diff --git a/extensions/container-image/container-image-docker-common/container-image-podman/deployment/pom.xml b/extensions/container-image/container-image-podman/deployment/pom.xml
similarity index 100%
rename from extensions/container-image/container-image-docker-common/container-image-podman/deployment/pom.xml
rename to extensions/container-image/container-image-podman/deployment/pom.xml
diff --git a/extensions/container-image/container-image-docker-common/container-image-podman/deployment/src/main/java/io/quarkus/container/image/podman/deployment/PodmanBuild.java b/extensions/container-image/container-image-podman/deployment/src/main/java/io/quarkus/container/image/podman/deployment/PodmanBuild.java
similarity index 100%
rename from extensions/container-image/container-image-docker-common/container-image-podman/deployment/src/main/java/io/quarkus/container/image/podman/deployment/PodmanBuild.java
rename to extensions/container-image/container-image-podman/deployment/src/main/java/io/quarkus/container/image/podman/deployment/PodmanBuild.java
diff --git a/extensions/container-image/container-image-docker-common/container-image-podman/deployment/src/main/java/io/quarkus/container/image/podman/deployment/PodmanConfig.java b/extensions/container-image/container-image-podman/deployment/src/main/java/io/quarkus/container/image/podman/deployment/PodmanConfig.java
similarity index 100%
rename from extensions/container-image/container-image-docker-common/container-image-podman/deployment/src/main/java/io/quarkus/container/image/podman/deployment/PodmanConfig.java
rename to extensions/container-image/container-image-podman/deployment/src/main/java/io/quarkus/container/image/podman/deployment/PodmanConfig.java
diff --git a/extensions/container-image/container-image-docker-common/container-image-podman/deployment/src/main/java/io/quarkus/container/image/podman/deployment/PodmanProcessor.java b/extensions/container-image/container-image-podman/deployment/src/main/java/io/quarkus/container/image/podman/deployment/PodmanProcessor.java
similarity index 100%
rename from extensions/container-image/container-image-docker-common/container-image-podman/deployment/src/main/java/io/quarkus/container/image/podman/deployment/PodmanProcessor.java
rename to extensions/container-image/container-image-podman/deployment/src/main/java/io/quarkus/container/image/podman/deployment/PodmanProcessor.java
diff --git a/extensions/container-image/container-image-docker-common/container-image-podman/pom.xml b/extensions/container-image/container-image-podman/pom.xml
similarity index 89%
rename from extensions/container-image/container-image-docker-common/container-image-podman/pom.xml
rename to extensions/container-image/container-image-podman/pom.xml
index f6f4e7b308bef8..57386b321fa803 100644
--- a/extensions/container-image/container-image-docker-common/container-image-podman/pom.xml
+++ b/extensions/container-image/container-image-podman/pom.xml
@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-container-image-docker-common-parent</artifactId>
+        <artifactId>quarkus-container-image-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
     </parent>
diff --git a/extensions/container-image/container-image-docker-common/container-image-podman/runtime/pom.xml b/extensions/container-image/container-image-podman/runtime/pom.xml
similarity index 100%
rename from extensions/container-image/container-image-docker-common/container-image-podman/runtime/pom.xml
rename to extensions/container-image/container-image-podman/runtime/pom.xml
diff --git a/extensions/container-image/container-image-docker-common/container-image-podman/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/container-image/container-image-podman/runtime/src/main/resources/META-INF/quarkus-extension.yaml
similarity index 100%
rename from extensions/container-image/container-image-docker-common/container-image-podman/runtime/src/main/resources/META-INF/quarkus-extension.yaml
rename to extensions/container-image/container-image-podman/runtime/src/main/resources/META-INF/quarkus-extension.yaml
diff --git a/extensions/container-image/pom.xml b/extensions/container-image/pom.xml
index 87d8a659ec9e0b..bb2474fd039f7c 100644
--- a/extensions/container-image/pom.xml
+++ b/extensions/container-image/pom.xml
@@ -21,6 +21,8 @@
         <module>util</module>
         <module>container-image-buildpack</module>
         <module>container-image-docker-common</module>
+        <module>container-image-docker</module>
+        <module>container-image-podman</module>
         <module>container-image-jib</module>
         <module>container-image-openshift</module>
     </modules>