From 3af2c33e719e06af84f8278dcc0cb826585af968 Mon Sep 17 00:00:00 2001 From: slohe1 Date: Mon, 18 Sep 2023 10:25:31 +0530 Subject: [PATCH 01/15] OPSEXP-2240 rockylinux 9 added --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 12a1fa2..f74589a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,6 +30,8 @@ jobs: major: 7 - flavor: rockylinux major: 8 + - flavor: rockylinux + major: 9 java_major: - 11 - 17 From 6b9b2a93c82576c5c23ef04f00a6fa49bbc5d492 Mon Sep 17 00:00:00 2001 From: slohe1 Date: Wed, 20 Sep 2023 21:10:57 +0530 Subject: [PATCH 02/15] OPSEXP-2240 exclude tomacat9 & java11 --- .github/workflows/main.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f74589a..c919f89 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -37,12 +37,19 @@ jobs: - 17 jdist: - jre - - jdk exclude: - base_image: flavor: centos major: 7 java_major: 17 + - base_image: + flavor: rockylinux + major: 9 + tomcat_major: 9 + - base_image: + flavor: rockylinux + major: 9 + java_major: 11 runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 From 73b996bb9bee846c7a8e7bd0f7361a3ac18d0032 Mon Sep 17 00:00:00 2001 From: slohe1 Date: Wed, 20 Sep 2023 23:17:20 +0530 Subject: [PATCH 03/15] OPSEXP-2240 readme update --- README.md | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 8c77cf0..c7d6df3 100644 --- a/README.md +++ b/README.md @@ -16,22 +16,16 @@ 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] +10 | 11 | jre | Centos 7 | tomcat10-jre11-centos7 | ![tomcat10-jre11-centos7 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] [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/tomcat10-jre11-centos7 +[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 * [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` @@ -89,9 +83,9 @@ docker buildx build -t $IMAGE_REPOSITORY . \ 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 +* JDIST is jre * TOMCAT_MAJOR is 8 or 9 ### Release From 54d82c94b696f588035032a7f62f90655c27c706 Mon Sep 17 00:00:00 2001 From: slohe1 Date: Thu, 21 Sep 2023 13:19:31 +0530 Subject: [PATCH 04/15] OPSEXP-2240 review comment --- .github/workflows/main.yml | 8 ++------ Dockerfile | 3 +-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c919f89..3f0ea2b 100644 --- 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 index 5545173..51ba615 100644 --- 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\ \n\ 404<\/error-code\>\n\ \/error.jsp<\/location\>\n\ <\/error-page\>\n\ \n\ 403<\/error-code\>\n\ \/error.jsp<\/location\>\n\ <\/error-page\>\n\ \n\ 500<\/error-code\>\n\ \/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 From 459286ffe5dea21e1a7a3fa496b7f79f89ecd957 Mon Sep 17 00:00:00 2001 From: slohe1 Date: Thu, 21 Sep 2023 14:03:06 +0530 Subject: [PATCH 05/15] OPSEXP-2240 review comment --- .github/workflows/main.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3f0ea2b..9ee71c6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -40,6 +40,10 @@ jobs: flavor: centos major: 7 java_major: 17 + - base_image: + flavor: centos + major: 7 + tomcat_major: 10 - base_image: flavor: rockylinux major: 9 From aee07770d7a1a8ed1faa75d4c6ea41804fb5a37b Mon Sep 17 00:00:00 2001 From: slohe1 Date: Thu, 21 Sep 2023 14:42:18 +0530 Subject: [PATCH 06/15] OPSEXP-2240 review comment --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index c7d6df3..fd6b411 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,6 @@ 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 ``` @@ -85,7 +84,6 @@ where: * DISTRIB_NAME is centos or rockylinux * DISTRIB_MAJOR is 7 for centos, 8 or 9 for rockylinux * JAVA_MAJOR is 11 or 17 for rockylinux only -* JDIST is jre * TOMCAT_MAJOR is 8 or 9 ### Release From 8bcec727ed999d24faee95131397674b797adfd5 Mon Sep 17 00:00:00 2001 From: slohe1 Date: Thu, 21 Sep 2023 17:07:39 +0530 Subject: [PATCH 07/15] OPSEXP-2240 review comment --- .github/workflows/main.yml | 36 +++++++++++++++++++++++++----------- README.md | 14 ++++++++------ 2 files changed, 33 insertions(+), 17 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9ee71c6..8fb3dc0 100644 --- 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 index fd6b411..dd1bc5e 100644 --- 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` From ed0ea810c602ca8fa28a36883960bc35ec5ac4f7 Mon Sep 17 00:00:00 2001 From: slohe1 Date: Thu, 21 Sep 2023 19:08:34 +0530 Subject: [PATCH 08/15] OPSEXP-2240 testing --- .github/workflows/main.yml | 57 ++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8fb3dc0..770ddfc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,36 +36,39 @@ jobs: - 11 - 17 include: - - tomcat_major: 9 - base_image: + - 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 + tomcat_major: 9 + # - base_image: + # flavor: centos + # major: 7 + # tomcat_major: 9 + # - base_image: + # flavor: rockylinux + # major: 8 + # java_major: 11 + + # - base_image: + # flavor: rockylinux + # major: 8 + # java_major: 17 + + # - base_image: + # flavor: rockylinux + # major: 8 + # java_major: 11 + + # - base_image: + # flavor: rockylinux + # major: 8 + # java_major: 17 + + # - base_image: + # flavor: rockylinux + # major: 9 + # java_major: 17 runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 From c3ec625e1d40db37038c82e2bed6e64514257d5e Mon Sep 17 00:00:00 2001 From: slohe1 Date: Thu, 21 Sep 2023 21:49:08 +0530 Subject: [PATCH 09/15] OPSEXP-2240 testing --- .github/workflows/main.yml | 71 +++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 39 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 770ddfc..6352688 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,53 +22,46 @@ jobs: strategy: fail-fast: false matrix: - tomcat_major: - - 9 - - 10 + tomcat_major: [""] base_image: - flavor: centos - major: 7 + major: [""] - flavor: rockylinux - major: 8 + major: [""] - flavor: rockylinux - major: 9 - java_major: - - 11 - - 17 + major: [""] + java_major: [""] include: - - base_image: + - tomcat_major: 9 + base_image: flavor: centos major: 7 java_major: 11 - tomcat_major: 9 - # - base_image: - # flavor: centos - # major: 7 - # tomcat_major: 9 - # - base_image: - # flavor: rockylinux - # major: 8 - # java_major: 11 - - # - base_image: - # flavor: rockylinux - # major: 8 - # java_major: 17 - - # - base_image: - # flavor: rockylinux - # major: 8 - # java_major: 11 - - # - base_image: - # flavor: rockylinux - # major: 8 - # java_major: 17 - - # - base_image: - # flavor: rockylinux - # major: 9 - # java_major: 17 + - 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: - uses: actions/checkout@v4 From 6e3f9771cda606dd18ff0ead8d5959d88bf87571 Mon Sep 17 00:00:00 2001 From: slohe1 Date: Thu, 21 Sep 2023 21:50:52 +0530 Subject: [PATCH 10/15] OPSEXP-2240 testing --- .github/workflows/main.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6352688..ade8cb6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,11 +24,7 @@ jobs: matrix: tomcat_major: [""] base_image: - - flavor: centos - major: [""] - - flavor: rockylinux - major: [""] - - flavor: rockylinux + - flavor: [""] major: [""] java_major: [""] include: From 48205afeb599e6ab6d4dfa024bd57fa42e5063ef Mon Sep 17 00:00:00 2001 From: slohe1 Date: Thu, 21 Sep 2023 22:04:16 +0530 Subject: [PATCH 11/15] OPSEXP-2240 testing --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ade8cb6..fce0929 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,10 +15,6 @@ env: IMAGE_REPOSITORY: alfresco-base-tomcat jobs: docker_images: - name: >- - Tomcat ${{ matrix.tomcat_major }} - jre${{ matrix.java_major }} - on ${{ matrix.base_image.flavor }}${{ matrix.base_image.major }} strategy: fail-fast: false matrix: @@ -58,6 +54,10 @@ jobs: flavor: rockylinux major: 9 java_major: 17 + name: >- + Tomcat ${{ matrix.tomcat_major }} + jre${{ matrix.java_major }} + on ${{ matrix.base_image.flavor }}${{ matrix.base_image.major }} runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 From 31dd209b6476aaa5d8e79973dce4aefa7f09e7b8 Mon Sep 17 00:00:00 2001 From: slohe1 Date: Thu, 21 Sep 2023 22:17:56 +0530 Subject: [PATCH 12/15] OPSEXP-2240 testing --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fce0929..6488267 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,6 +15,10 @@ env: IMAGE_REPOSITORY: alfresco-base-tomcat jobs: docker_images: + name: >- + Tomcat ${{ matrix.include.tomcat_major }} + jre${{ matrix.include.java_major }} + on ${{ matrix.include.base_image.flavor }}${{ matrix.include.base_image.major }} strategy: fail-fast: false matrix: @@ -54,10 +58,6 @@ jobs: flavor: rockylinux major: 9 java_major: 17 - name: >- - Tomcat ${{ matrix.tomcat_major }} - jre${{ matrix.java_major }} - on ${{ matrix.base_image.flavor }}${{ matrix.base_image.major }} runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 From f2c3d4a1de7d92bf2c0d24a67f1eae5292d8c87e Mon Sep 17 00:00:00 2001 From: slohe1 Date: Fri, 22 Sep 2023 01:18:39 +0530 Subject: [PATCH 13/15] OPSEXP-2240 testing --- .github/workflows/main.yml | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6488267..3e3bcd5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,17 +16,25 @@ env: jobs: docker_images: name: >- - Tomcat ${{ matrix.include.tomcat_major }} - jre${{ matrix.include.java_major }} - on ${{ matrix.include.base_image.flavor }}${{ matrix.include.base_image.major }} + Tomcat ${{ matrix.tomcat_major }} + jre${{ matrix.java_major }} + on ${{ matrix.base_image.flavor }}${{ matrix.base_image.major }} strategy: fail-fast: false matrix: - tomcat_major: [""] - base_image: - - flavor: [""] - major: [""] - java_major: [""] + # tomcat_major: + # - 9 + # - 10 + # base_image: + # - flavor: centos + # major: 7 + # - flavor: rockylinux + # major: 8 + # - flavor: rockylinux + # major: 9 + # java_major: + # - 11 + # - 17 include: - tomcat_major: 9 base_image: From 0ed428cb9fc1e749b87b2d218db40e0ab7e97c11 Mon Sep 17 00:00:00 2001 From: slohe1 Date: Fri, 22 Sep 2023 01:19:39 +0530 Subject: [PATCH 14/15] OPSEXP-2240 testing --- .github/workflows/main.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3e3bcd5..d9d821b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,19 +22,6 @@ jobs: strategy: fail-fast: false matrix: - # tomcat_major: - # - 9 - # - 10 - # base_image: - # - flavor: centos - # major: 7 - # - flavor: rockylinux - # major: 8 - # - flavor: rockylinux - # major: 9 - # java_major: - # - 11 - # - 17 include: - tomcat_major: 9 base_image: From cb57dbe8f91a26c7c1e0120b4bc3dccd88d63840 Mon Sep 17 00:00:00 2001 From: slohe1 Date: Fri, 22 Sep 2023 01:21:55 +0530 Subject: [PATCH 15/15] OPSEXP-2240 ready for review --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d9d821b..1ebf816 100644 --- a/.github/workflows/main.yml +++ b/.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/**