container-image-podman extension

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);

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 {

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>

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>

extensions/container-image/container-image-docker-common/container-image-docker/pom.xml → 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>

extensions/container-image/container-image-docker-common/container-image-podman/pom.xml → 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>

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>