OPSEXP-2240 review comment

Alfresco · Sep 21, 2023 · 5f8c80f · 5f8c80f
1 parent 90de4f9
commit 5f8c80f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -17,7 +17,7 @@ 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
@@ -35,8 +35,6 @@ jobs:
         java_major:
           - 11
           - 17
-        jdist:
-          - jre
         exclude:
           - base_image:
               flavor: centos
@@ -58,7 +56,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
@@ -93,7 +91,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 }}
@@ -127,7 +124,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 }}

diff --git a/Dockerfile b/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