Merge pull request #273 from porschesstein/features/bump-to-ubi-8.10

Bump ubi-micro and ubi-minimal to 8.10
quarkusio · Jun 6, 2024 · 2479f0d · 2479f0d
2 parents 2037038 + 9d75a81
commit 2479f0d
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -160,9 +160,9 @@ To update them, edit the `pom.xml` file:
 
 ```xml
 <!-- See https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8 -->
-<ubi-min.base>registry.access.redhat.com/ubi8/ubi-minimal:8.9</ubi-min.base>
-<!-- See https://catalog.redhat.com/software/containers/ubi8/ubi-micro/5ff3f50a831939b08d1b832a -->
-<ubi-micro.base>registry.access.redhat.com/ubi8-micro:8.9</ubi-micro.base>
+<ubi-min.base>registry.access.redhat.com/ubi8/ubi-minimal:8.10</ubi-min.base>
+<!-- See https://catalog.redhat.com/software/containers/ubi8-micro/601a84aadd19c7786c47c8ea -->
+<ubi-micro.base>registry.access.redhat.com/ubi8-micro:8.10</ubi-micro.base>
 ```
 
 ### Pushing the image to quay

diff --git a/jdock/src/test/java/io/quarkus/images/Builders.java b/jdock/src/test/java/io/quarkus/images/Builders.java
@@ -5,7 +5,7 @@
 public class Builders {
 
     public static Dockerfile getMandrelDockerFile(String version, String javaVersion, String arch, String sha) {
-        Dockerfile df = Dockerfile.from("registry.access.redhat.com/ubi8/ubi-minimal:8.9");
+        Dockerfile df = Dockerfile.from("registry.access.redhat.com/ubi8/ubi-minimal:8.10");
         df
                 .installer("microdnf")
                 .user("root")
@@ -29,7 +29,7 @@ public static Dockerfile getMandrelDockerFile(String version, String javaVersion
     }
 
     public static Dockerfile getGraalVmDockerFile(String version, String javaVersion, String arch, String sha) {
-        Dockerfile df = Dockerfile.from("registry.access.redhat.com/ubi8/ubi-minimal:8.9");
+        Dockerfile df = Dockerfile.from("registry.access.redhat.com/ubi8/ubi-minimal:8.10");
         df
                 .installer("microdnf")
                 .user("root")

diff --git a/jdock/src/test/java/io/quarkus/images/DistrolessTest.java b/jdock/src/test/java/io/quarkus/images/DistrolessTest.java
@@ -28,7 +28,7 @@ void testBuildingDistrolessImage() {
     void testBuildingMicroImage() {
         System.out.println(Dockerfile
                 .multistages()
-                .stage("ubi", Dockerfile.from("registry.access.redhat.com/ubi8/ubi-minimal:8.9"))
+                .stage("ubi", Dockerfile.from("registry.access.redhat.com/ubi8/ubi-minimal:8.10"))
                 .stage("scratch", Dockerfile.from("registry.access.redhat.com/ubi8/ubi-micro"))
                 .stage(Dockerfile.from("scratch")
                         .copyFromStage("ubi", "/usr/lib64/libgcc_s.so.1")

diff --git a/jdock/src/test/java/io/quarkus/images/MultiMicroTest.java b/jdock/src/test/java/io/quarkus/images/MultiMicroTest.java
@@ -18,7 +18,7 @@ static void init() {
     @Test
     void test() {
         MultiStageDockerFile micro = Dockerfile.multistages()
-                .stage("ubi", Dockerfile.from("registry.access.redhat.com/ubi8/ubi-minimal:8.9"))
+                .stage("ubi", Dockerfile.from("registry.access.redhat.com/ubi8/ubi-minimal:8.10"))
                 .stage("scratch", Dockerfile.from("registry.access.redhat.com/ubi8/ubi-micro"))
                 .stage(Dockerfile.from("scratch")
                         .copyFromStage("ubi", "/usr/lib64/libgcc_s.so.1")

diff --git a/jdock/src/test/java/io/quarkus/images/SimpleTest.java b/jdock/src/test/java/io/quarkus/images/SimpleTest.java
@@ -58,14 +58,14 @@ public void testGraalvmAmd64() {
 
     @Test
     public void testRunWithExecForm() {
-        Dockerfile df = Dockerfile.from("registry.access.redhat.com/ubi8/ubi-minimal:8.9");
+        Dockerfile df = Dockerfile.from("registry.access.redhat.com/ubi8/ubi-minimal:8.10");
         df.exec("/bin/bash", "-c", "echo hello");
         assertThat(df.build()).contains("RUN [ \"/bin/bash\", \"-c\", \"echo hello\" ]\n");
     }
 
     @Test
     public void testRunWithShellForm() {
-        Dockerfile df = Dockerfile.from("registry.access.redhat.com/ubi8/ubi-minimal:8.9");
+        Dockerfile df = Dockerfile.from("registry.access.redhat.com/ubi8/ubi-minimal:8.10");
         df.run("source $HOME/.bashrc", "echo $HOME");
         assertThat(df.build()).contains("RUN source $HOME/.bashrc \\\n && echo $HOME\n");
     }

diff --git a/pom.xml b/pom.xml
@@ -35,9 +35,9 @@
         <maven.compiler.target>17</maven.compiler.target>
 
         <!-- See https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8 -->
-        <ubi-min.base>registry.access.redhat.com/ubi8/ubi-minimal:8.9</ubi-min.base>
-        <!-- See https://catalog.redhat.com/software/containers/ubi8/ubi-micro/5ff3f50a831939b08d1b832a -->
-        <ubi-micro.base>registry.access.redhat.com/ubi8-micro:8.9</ubi-micro.base>
+        <ubi-min.base>registry.access.redhat.com/ubi8/ubi-minimal:8.10</ubi-min.base>
+        <!-- See https://catalog.redhat.com/software/containers/ubi8-micro/601a84aadd19c7786c47c8ea -->
+        <ubi-micro.base>registry.access.redhat.com/ubi8-micro:8.10</ubi-micro.base>
 
         <jdock.dry-run>false</jdock.dry-run>
     </properties>