Support for UBI 8 and 9

quarkusio · Apr 19, 2023 · 6343430 · 6343430
1 parent 8c90133
commit 6343430
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 23 deletions.
diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
@@ -18,6 +18,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        ubi:
+          - "default"
+          - "9.1"
         include:
           - name: "base images"
             modules: "quarkus-distroless-base-image,quarkus-micro-base-image"
@@ -39,23 +42,32 @@ jobs:
             args: "-Polder-graalvm"            
 
     steps:
-    - run: |
+    - id: prepare
+      run: |
         # Re-claim some disk space
         sudo swapoff -a
         sudo rm -f /swapfile
         sudo apt-get clean
-        docker rmi $(docker image ls -aq)
+        docker image ls -aq | xargs -r docker rmi
         df -h
-    - uses: actions/checkout@v1
+        
+        # Set up UBI params
+        if [ "${{ matrix.ubi }}" != "default" ]; then
+          IFS='.' read -r ubi_major ubi_minor <<< "${{ matrix.ubi }}"
+          echo "ubi-args='-Dubi.tag=ubi${ubi_major} -Dubi.rel.major=${ubi_major} -Dubi.rel.minor=${ubi_minor}'" >> "$GITHUB_OUTPUT"
+        else
+          echo "ubi-args=" >> "$GITHUB_OUTPUT"
+        fi
+    - uses: actions/checkout@v3
     - uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
         java-version: '17'
     - name: Set up QEMU
-      uses: docker/setup-qemu-action@v1
+      uses: docker/setup-qemu-action@v2
     - name: Set up Docker Buildx
       id: buildx
-      uses: docker/setup-buildx-action@v1
+      uses: docker/setup-buildx-action@v2
       with:
         install: true
     - name: Inspect builder
@@ -65,8 +77,14 @@ jobs:
         echo "Status:    ${{ steps.buildx.outputs.status }}"
         echo "Flags:     ${{ steps.buildx.outputs.flags }}"
         echo "Platforms: ${{ steps.buildx.outputs.platforms }}"
-    - name: Build ${{ matrix.name }}
-      run: mvn install --projects ${{ matrix.modules }} --also-make -DskipTests ${{ matrix.args }}
+    - name: Build ${{ matrix.name }} on ${{ matrix.ubi }}
+      run:
+        mvn install
+          --projects ${{ matrix.modules }}
+          --also-make
+          -DskipTests
+          ${{ matrix.args }}
+          ${{ steps.prepare.outputs.ubi-args }}
     - name: Print ${{ matrix.name}}
       if: always()
       run: docker images
diff --git a/.github/workflows/push-images.yml b/.github/workflows/push-images.yml
@@ -13,6 +13,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        ubi:
+          - "ubi8"
+          - "ubi9"
         include:
           - name: "base images"
             modules: "quarkus-distroless-base-image,quarkus-micro-base-image"
@@ -33,23 +36,32 @@ jobs:
             modules: "quarkus-graalvm-builder-image"
             args: "-Polder-graalvm"
     steps:
-      - run: |
+      - id: prepare
+        run: |
           # Re-claim some disk space
           sudo swapoff -a
           sudo rm -f /swapfile
           sudo apt-get clean
-          docker rmi $(docker image ls -aq)
+          docker image ls -aq | xargs -r docker rmi
           df -h
-      - uses: actions/checkout@v1
+          
+          # Set up UBI params
+          if [ "${{ matrix.ubi }}" != "default" ]; then
+          IFS='.' read -r ubi_major ubi_minor <<< "${{ matrix.ubi }}"
+          echo "ubi-args='-Dubi.tag=ubi${ubi_major} -Dubi.rel.major=${ubi_major} -Dubi.rel.minor=${ubi_minor}'" >> "$GITHUB_OUTPUT"
+          else
+          echo "ubi-args=" >> "$GITHUB_OUTPUT"
+          fi
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: '17'
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
         with:
           install: true
       - name: Inspect builder
@@ -65,8 +77,15 @@ jobs:
           registry: quay.io
           username: ${{ secrets.QUAY_USER }}
           password: ${{ secrets.QUAY_TOKEN }}
-      - name: Build images
-        run: mvn install --projects ${{ matrix.modules }} --also-make -DskipTests -Ppush ${{ matrix.args }}
+      - name: Build images on ${{ matrix.ubi }}
+        run:
+          mvn install
+            --projects ${{ matrix.modules }}
+            --also-make
+            -DskipTests
+            -Ppush
+            ${{ matrix.args }}
+            ${{ steps.prepare.outputs.ubi-args }}
       - name: Print ${{ matrix.name}}
         if: always()
         run: |

diff --git a/pom.xml b/pom.xml
@@ -33,10 +33,17 @@
         <maven.compiler.source>17</maven.compiler.source>
         <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.7</ubi-min.base>
-        <!-- See https://catalog.redhat.com/software/containers/ubi8/ubi-micro/5ff3f50a831939b08d1b832a -->
-        <ubi-micro.base>registry.access.redhat.com/ubi8-micro:8.7</ubi-micro.base>
+        <!-- Will be used as a prefix to the output image name -->
+        <ubi.tag>ubi</ubi.tag>
+        <ubi.release>${ubi.rel.major}.${ubi.rel.minor}</ubi.release>
+
+        <!-- ubi-minimal: https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8 -->
+        <!-- ubi-micro:   https://catalog.redhat.com/software/containers/ubi8/ubi-micro/5ff3f50a831939b08d1b832a -->
+        <ubi.rel.major>8</ubi.rel.major>
+        <ubi.rel.minor>7</ubi.rel.minor>
+
+        <ubi-min.base>registry.access.redhat.com/ubi${ubi.rel.major}/ubi-minimal:${ubi.release}</ubi-min.base>
+        <ubi-micro.base>registry.access.redhat.com/ubi${ubi.rel.major}-micro:${ubi.release}</ubi-micro.base>
 
         <jdock.dry-run>false</jdock.dry-run>
     </properties>

diff --git a/quarkus-binary-s2i/pom.xml b/quarkus-binary-s2i/pom.xml
@@ -33,7 +33,7 @@
                     <args>
                         <argument>--dockerfile-dir=${project.basedir}/target/docker</argument>
                         <argument>--ubi-minimal=${ubi-min.base}</argument>
-                        <argument>--out=quay.io/quarkus/ubi-quarkus-native-binary-s2i:2.0</argument>
+                        <argument>--out=quay.io/quarkus/${ubi.tag}-quarkus-native-binary-s2i:2.0</argument>
                         <argument>--basedir=${project.basedir}</argument>
                         <argument>--dry-run=${jdock.dry-run}</argument>
                     </args>

diff --git a/quarkus-graalvm-builder-image/pom.xml b/quarkus-graalvm-builder-image/pom.xml
@@ -34,7 +34,7 @@
                     <args>
                         <argument>--dockerfile-dir=${project.basedir}/target/docker</argument>
                         <argument>--ubi-minimal=${ubi-min.base}</argument>
-                        <argument>--out=quay.io/quarkus/ubi-quarkus-graalvmce-builder-image</argument>
+                        <argument>--out=quay.io/quarkus/${ubi.tag}-quarkus-graalvmce-builder-image</argument>
                         <argument>--in=${images.file}</argument>
                         <argument>--dry-run=${jdock.dry-run}</argument>
                     </args>

diff --git a/quarkus-mandrel-builder-image/pom.xml b/quarkus-mandrel-builder-image/pom.xml
@@ -34,7 +34,7 @@
                     <args>
                         <argument>--dockerfile-dir=${project.basedir}/target/docker</argument>
                         <argument>--ubi-minimal=${ubi-min.base}</argument>
-                        <argument>--out=quay.io/quarkus/ubi-quarkus-mandrel-builder-image</argument>
+                        <argument>--out=quay.io/quarkus/${ubi.tag}-quarkus-mandrel-builder-image</argument>
                         <argument>--in=${images.file}</argument>
                         <argument>--dry-run=${jdock.dry-run}</argument>
                     </args>

diff --git a/quarkus-micro-base-image/pom.xml b/quarkus-micro-base-image/pom.xml
@@ -34,7 +34,7 @@
                         <argument>--dockerfile-dir=${pom.basedir}/target/docker</argument>
                         <argument>--ubi-minimal=${ubi-min.base}</argument>
                         <argument>--ubi-micro=${ubi-micro.base}</argument>
-                        <argument>--out=quay.io/quarkus/quarkus-micro-image:2.0</argument>
+                        <argument>--out=quay.io/quarkus/${ubi.tag}-quarkus-micro-image:2.0</argument>
                         <argument>--dry-run=${jdock.dry-run}</argument>
                     </args>
                 </configuration>

diff --git a/quarkus-native-s2i/pom.xml b/quarkus-native-s2i/pom.xml
@@ -33,7 +33,7 @@
                     <args>
                         <argument>--dockerfile-dir=${project.basedir}/target/docker</argument>
                         <argument>--ubi-minimal=${ubi-min.base}</argument>
-                        <argument>--out=quay.io/quarkus/ubi-quarkus-graalvmce-s2i</argument>
+                        <argument>--out=quay.io/quarkus/${ubi.tag}-quarkus-graalvmce-s2i</argument>
                         <argument>--in=${project.basedir}/graalvm.yaml</argument>
                         <argument>--basedir=${project.basedir}</argument>
                         <argument>--dry-run=${jdock.dry-run}</argument>