OPSEXP-2240 review comment

Alfresco · Sep 21, 2023 · 8bcec72 · 8bcec72
1 parent aee0777
commit 8bcec72
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 17 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -35,23 +35,37 @@ jobs:
         java_major:
           - 11
           - 17
-        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
-          - base_image:
-              flavor: centos
-              major: 7
-            tomcat_major: 10
-          - base_image:
+          - tomcat_major: 10
+            base_image:
               flavor: rockylinux
-              major: 9
-            tomcat_major: 9
-          - base_image:
+              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: 11
+            java_major: 17
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

diff --git a/README.md b/README.md
@@ -16,16 +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]
-10             | 11           | jre          | Centos 7         | tomcat10-jre11-centos7       | ![tomcat10-jre11-centos7 size][2]
+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             | 17           | jre          | Rocky Linux 8    | tomcat10-jre17-rockylinux8   | ![tomcat10-jre17-rockylinux8 size][4]
-10             | 17           | jre          | Rocky Linux 9    | tomcat10-jre17-rockylinux9   | ![tomcat10-jre17-rockylinu9 size][5]
+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/tomcat10-jre11-centos7
+[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-jre17-rockylinux8
-[5]: https://img.shields.io/docker/image-size/alfresco/alfresco-base-tomcat/tomcat10-jre17-rockylinux9
+[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`