Issue #3673: Use different dockerfiles for nginx-kerberos 10.0 and 10.1

RotherOSS · Nov 7, 2024 · ac3fa4c · ac3fa4c
1 parent a4bb2bb
commit ac3fa4c
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 15 deletions.
diff --git a/.github/workflows/docker_image_update_autobuild.yml b/.github/workflows/docker_image_update_autobuild.yml
@@ -42,7 +42,22 @@ jobs:
             target:     'otobo-web'
             docker_tag: 'latest-11_0-autobuild'
             base_image: 'perl:5.38-bookworm'
-          # common info for every target; for nginx this includes the base image
+
+          # otobo-nginx-kerberos-webproxy uses different dockerfiles in 10.0 and 10.1
+          -
+            target:     'otobo-nginx-kerberos-webproxy'
+            docker_tag: 'latest-10_0-autobuild'
+            dockerfile: 'otobo.nginx-kerberos.dockerfile'
+          -
+            target:     'otobo-nginx-kerberos-webproxy'
+            docker_tag: 'latest-10_1-autobuild'
+            dockerfile: 'otobo.nginx-kerberos.dockerfile'
+          -
+            target:     'otobo-nginx-kerberos-webproxy'
+            docker_tag: 'latest-11_0-autobuild'
+            dockerfile: 'otobo.nginx.dockerfile'
+
+          # common info for every target; for nginx this includes the base imagie
           -
             target:     'otobo-web'
             dockerfile: 'otobo.web.dockerfile'
@@ -56,7 +71,6 @@ jobs:
             base_image: 'nginx:mainline'
           -
             target:     'otobo-nginx-kerberos-webproxy'
-            dockerfile: 'otobo.nginx.dockerfile'
             context:    'scripts/nginx'
             repository: 'rotheross/otobo-nginx-kerberos-webproxy'
             base_image: 'nginx:mainline'

diff --git a/.github/workflows/docker_image_update_checker.yml b/.github/workflows/docker_image_update_checker.yml
@@ -19,7 +19,6 @@ on:
 
 jobs:
   CheckDockerImageUpdate:
-    runs-on: 'ubuntu-latest'
     strategy:
 
       # create different images
@@ -39,7 +38,7 @@ jobs:
             dockerfile: 'otobo.elasticsearch.dockerfile'
             context:    'scripts/elasticsearch'
             repository: 'rotheross/otobo-elasticsearch'
-            base_image: 'docker.elastic.co/elasticsearch/elasticsearch:7.17.25'
+            base_image: 'elasticsearch:7.17.3'
           -
             target:     'otobo-nginx-webproxy'
             dockerfile: 'otobo.nginx.dockerfile'
@@ -59,13 +58,13 @@ jobs:
             repository: 'rotheross/otobo-selenium-chrome'
             base_image: 'selenium/standalone-chrome-debug:3.141.59-20210422'
 
-
+    runs-on: ${{ matrix.target }}
     steps:
 
       - name: Setting up the environment file
         run: |
-          patch="${{ matrix.patch }}"
-          docker_tag="rel-${patch}_test"
+          patch=${{ matrix.patch }}
+          docker_tag="rel-${patch}"
           mixed_case_repository="${{ github.repository }}"
           lowercased_repository="${mixed_case_repository,,}"
           build_date=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
@@ -120,24 +119,24 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           load: true
-          context: .
-          file: otobo.web.dockerfile
+          context: ${{ matrix.context }}
+          file: ${{ matrix.dockerfile }}
           pull: true
           build-args: |
             BUILD_DATE=${{ env.otobo_build_date }}
             DOCKER_TAG=${{ env.otobo_docker_tag }}
             GIT_REPO=${{ github.repositoryUrl }}
             GIT_BRANCH=${{ env.otobo_branch }}
             GIT_COMMIT=${{ env.otobo_commit }}
-          target: otobo-web
+          target: ${{ matrix.target }}
           tags: ${{ env.otobo_image }}
           cache-from: type=gha
           cache-to: type=gha,mode=max`
 
       -
         # otobo_first_time hasn't run yet, so /opt/otobo is still empty
         name: Info
-        if: steps.check.outputs.needs-updating == 'true'
+        if: ${{ steps.check.outputs.needs-updating == 'true' && matrix.target == 'otobo-web' }}
         run: |
           docker run --rm -w /opt/otobo_install/otobo_next --entrypoint /bin/bash $otobo_image -c "more git-repo.txt git-branch.txt git-commit.txt RELEASE | cat"
 
@@ -158,16 +157,16 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           push: true
-          context: .
-          file: otobo.web.dockerfile
+          context: ${{ matrix.context }}
+          file: ${{ matrix.dockerfile }}
           pull: true
           build-args: |
             BUILD_DATE=${{ env.otobo_build_date }}
             DOCKER_TAG=${{ env.otobo_docker_tag }}
             GIT_REPO=${{ github.repositoryUrl }}
             GIT_BRANCH=${{ env.otobo_branch }}
             GIT_COMMIT=${{ env.otobo_commit }}
-          target: otobo-web
+          target: ${{ matrix.target }}
           tags: ${{ env.otobo_image }}
           cache-from: type=gha
-          cache-to: type=gha,mode=max`
+          cache-to: type=gha,mode=max