OPSEXP-2240 Provide a rockylinux 9 + tomcat 10 tomcat base image

.github/workflows/main.yml

@@ -6,6 +6,7 @@ on:
       - master
       - bump-tomcat**
       - OPSEXP-[0-9]+**
+      - opsexp-[0-9]+**
     paths-ignore:
       - .github/workflows/bumpVersions.yml
       - updatecli.d/**
@@ -17,29 +18,41 @@ jobs:
   docker_images:
     name: >-
       Tomcat ${{ matrix.tomcat_major }}
-      ${{ matrix.jdist }}${{ matrix.java_major }}
+      jre${{ matrix.java_major }}
       on ${{ matrix.base_image.flavor }}${{ matrix.base_image.major }}
     strategy:
       fail-fast: false
       matrix:
-        tomcat_major:
-          - 9
-          - 10
-        base_image:
-          - flavor: centos
-            major: 7
-          - flavor: rockylinux
-            major: 8
-        java_major:
-          - 11
-          - 17
-        jdist:
-          - jre
-          - jdk
-        exclude:
-          - base_image:
+        include:
+          - tomcat_major: 9
+            base_image:
               flavor: centos
               major: 7
+            java_major: 11
+          - tomcat_major: 9
+            base_image:
+              flavor: rockylinux
+              major: 8
+            java_major: 11
+          - tomcat_major: 9
+            base_image:
+              flavor: rockylinux
+              major: 8
+            java_major: 17
+          - tomcat_major: 10
+            base_image:
+              flavor: rockylinux
+              major: 8
+            java_major: 11
+          - tomcat_major: 10
+            base_image:
+              flavor: rockylinux
+              major: 8
+            java_major: 17
+          - tomcat_major: 10
+            base_image:
+              flavor: rockylinux
+              major: 9
             java_major: 17
     runs-on: ubuntu-latest
     steps:
@@ -49,7 +62,7 @@ jobs:
       - id: vars
         name: Compute Image Tag
         env:
-          IMAGE_BASE_NAME: tomcat${{ matrix.tomcat_major }}-${{ matrix.jdist }}${{ matrix.java_major }}-${{ matrix.base_image.flavor }}${{ matrix.base_image.major }}
+          IMAGE_BASE_NAME: tomcat${{ matrix.tomcat_major }}-jre${{ matrix.java_major }}-${{ matrix.base_image.flavor }}${{ matrix.base_image.major }}
         run: |
           if [[ "${{ github.ref_name }}" != "master" ]]
           then
@@ -84,7 +97,6 @@ jobs:
           load: true
           build-args: |
             no-cache=true
-            JDIST=${{ matrix.jdist }}
             DISTRIB_NAME=${{ matrix.base_image.flavor }}
             DISTRIB_MAJOR=${{ matrix.base_image.major }}
             JAVA_MAJOR=${{ matrix.java_major }}
@@ -118,7 +130,6 @@ jobs:
         with:
           push: true
           build-args: |
-            JDIST=${{ matrix.jdist }}
             DISTRIB_NAME=${{ matrix.base_image.flavor }}
             DISTRIB_MAJOR=${{ matrix.base_image.major }}
             JAVA_MAJOR=${{ matrix.java_major }}

Dockerfile

@@ -1,6 +1,5 @@
 # Alfresco Base Tomcat Image
 # see also https://github.com/docker-library/tomcat
-ARG JDIST
 ARG JAVA_MAJOR
 ARG DISTRIB_NAME
 ARG DISTRIB_MAJOR
@@ -89,7 +88,7 @@ RUN \
   sed -i "$ d" conf/web.xml ; \
   sed -i -e "\$a\    <error-page\>\n\        <error-code\>404<\/error-code\>\n\        <location\>\/error.jsp<\/location\>\n\    <\/error-page\>\n\    <error-page\>\n\        <error-code\>403<\/error-code\>\n\        <location\>\/error.jsp<\/location\>\n\    <\/error-page\>\n\    <error-page\>\n\        <error-code\>500<\/error-code\>\n\        <location\>\/error.jsp<\/location\>\n\    <\/error-page\>\n\n\<\/web-app\>" conf/web.xml
 
-FROM quay.io/alfresco/alfresco-base-java:${JDIST}${JAVA_MAJOR}-${DISTRIB_NAME}${DISTRIB_MAJOR} AS TOMCAT_BASE_IMAGE
+FROM quay.io/alfresco/alfresco-base-java:jre${JAVA_MAJOR}-${DISTRIB_NAME}${DISTRIB_MAJOR} AS TOMCAT_BASE_IMAGE
 ARG JAVA_MAJOR
 ARG DISTRIB_MAJOR
 ARG CREATED

README.md

@@ -16,22 +16,18 @@ Choose between one of the available flavours built from this repository:
 Tomcat version | Java version | Java flavour | OS               | Image tag                    | Size
 ---------------|--------------|--------------|------------------|------------------------------|-------------------------------------
 9              | 11           | jre          | Centos 7         | tomcat9-jre11-centos7        | ![tomcat9-jre11-centos7 size][1]
-9              | 11           | jdk          | Centos 7         | tomcat9-jdk11-centos7        | ![tomcat9-jdk11-centos7 size][2]
-10             | 11           | jre          | Centos 7         | tomcat10-jre11-centos7       | ![tomcat10-jre11-centos7 size][3]
-10             | 11           | jdk          | Centos 7         | tomcat10-jdk11-centos7       | ![tomcat10-jdk11-centos7 size][4]
-9              | 17           | jre          | Rocky Linux 8    | tomcat9-jre17-rockylinux8    | ![tomcat9-jre17-rockylinux8 size][5]
-9              | 17           | jdk          | Rocky Linux 8    | tomcat9-jdk17-rockylinux8    | ![tomcat9-jdk17-rockylinux8 size][6]
-10             | 17           | jre          | Rocky Linux 8    | tomcat10-jre17-rockylinux8   | ![tomcat10-jre17-rockylinux8 size][7]
-10             | 17           | jdk          | Rocky Linux 8    | tomcat10-jdk17-rockylinux8   | ![tomcat10-jdk17-rockylinux8 size][8]
+9              | 11           | jre          | Rocky Linux 8    | tomcat9-jre11-rockylinux8    | ![tomcat9-jre11-rockylinux8 size][2]
+9              | 17           | jre          | Rocky Linux 8    | tomcat9-jre17-rockylinux8    | ![tomcat9-jre17-rockylinux8 size][3]
+10             | 11           | jre          | Rocky Linux 8    | tomcat9-jre11-rockylinux8    | ![tomcat10-jre11-rockylinux8 size][4]
+10             | 17           | jre          | Rocky Linux 8    | tomcat10-jre17-rockylinux8   | ![tomcat10-jre17-rockylinux8 size][5]
+10             | 17           | jre          | Rocky Linux 9    | tomcat10-jre17-rockylinux9   | ![tomcat10-jre17-rockylinu9 size][6]
 
 [1]: https://img.shields.io/docker/image-size/alfresco/alfresco-base-tomcat/tomcat9-jre11-centos7
-[2]: https://img.shields.io/docker/image-size/alfresco/alfresco-base-tomcat/tomcat9-jdk11-centos7
-[3]: https://img.shields.io/docker/image-size/alfresco/alfresco-base-tomcat/tomcat10-jre11-centos7
-[4]: https://img.shields.io/docker/image-size/alfresco/alfresco-base-tomcat/tomcat10-jdk11-centos7
-[5]: https://img.shields.io/docker/image-size/alfresco/alfresco-base-tomcat/tomcat9-jre17-rockylinux8
-[6]: https://img.shields.io/docker/image-size/alfresco/alfresco-base-tomcat/tomcat9-jdk17-rockylinux8
-[7]: https://img.shields.io/docker/image-size/alfresco/alfresco-base-tomcat/tomcat10-jre17-rockylinux8
-[8]: https://img.shields.io/docker/image-size/alfresco/alfresco-base-tomcat/tomcat10-jdk17-rockylinux8
+[2]: https://img.shields.io/docker/image-size/alfresco/alfresco-base-tomcat/tomcat9-jre11-rockylinux8
+[3]: https://img.shields.io/docker/image-size/alfresco/alfresco-base-tomcat/tomcat9-jre17-rockylinux8
+[4]: https://img.shields.io/docker/image-size/alfresco/alfresco-base-tomcat/tomcat10-jre11-rockylinux8
+[5]: https://img.shields.io/docker/image-size/alfresco/alfresco-base-tomcat/tomcat10-jre17-rockylinux8
+[6]: https://img.shields.io/docker/image-size/alfresco/alfresco-base-tomcat/tomcat10-jre17-rockylinux9
 
 * [Docker Hub](https://hub.docker.com/r/alfresco/alfresco-base-tomcat) image name: `alfresco/alfresco-base-tomcat`
 * [Quay](https://quay.io/repository/alfresco/alfresco-base-tomcat) image name: `quay.io/alfresco/alfresco-base-tomcat`
@@ -81,17 +77,15 @@ docker buildx build -t $IMAGE_REPOSITORY . \
   --build-arg DISTRIB_NAME=$DISTRIB_NAME \
   --build-arg DISTRIB_MAJOR=$DISTRIB_MAJOR \
   --build-arg JAVA_MAJOR=$JAVA_MAJOR \
-  --build-arg JDIST=$JDIST \
   --build-arg TOMCAT_MAJOR=$TOMCAT_MAJOR \
   --no-cache
 ```
 
 where:
 
 * DISTRIB_NAME is centos or rockylinux
-* DISTRIB_MAJOR is 7 for centos or 8 for rockylinux
+* DISTRIB_MAJOR is 7 for centos, 8 or 9 for rockylinux
 * JAVA_MAJOR is 11 or 17 for rockylinux only
-* JDIST is jre or jdk
 * TOMCAT_MAJOR is 8 or 9
 
 ### Release