Always publish latest and maintainance version (#679)

* publish 2.24.4 image
kartoza · Jul 25, 2024 · cf2f833 · cf2f833
1 parent e7623c1
commit cf2f833
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 10 deletions.
diff --git a/.github/workflows/build-latest.yaml b/.github/workflows/build-latest.yaml
@@ -23,7 +23,10 @@ jobs:
   build-activemq-docker-image:
     runs-on: ubuntu-latest
     timeout-minutes: 5
-    if: github.actor != 'dependabot[bot]' && contains(github.event.comment.body, '/skiprelease') && contains(github.event.comment.title, '[skiprelease]')
+    if: |
+      github.actor != 'dependabot[bot]' &&
+      (!contains(github.event.comment.body, '/skiprelease') ||
+      !contains(github.event.comment.title, '[skiprelease]'))
     steps:
       - uses: actions/checkout@v4
       - name: Set up QEMU
@@ -53,7 +56,10 @@ jobs:
   build-geoserver-docker-image:
     runs-on: ubuntu-latest
     timeout-minutes: 15
-    if: github.actor != 'dependabot[bot]'  && contains(github.event.comment.body, '/skiprelease') && contains(github.event.comment.title, '[skiprelease]')
+    if: |
+      github.actor != 'dependabot[bot]' &&
+      (!contains(github.event.comment.body, '/skiprelease') ||
+      !contains(github.event.comment.title, '[skiprelease]'))
     strategy:
       matrix:
         geoserverMajorVersion:
@@ -62,8 +68,10 @@ jobs:
           - image: 9.0.91-jdk11-temurin-focal
             javaHome: /opt/java/openjdk
         geoserverMinorVersion:
-          - minor: 25
-            patch: 2
+#          - minor: 25
+#            patch: 2
+          - minor: 24
+            patch: 4
         stablePluginBaseURL:
           - https://sourceforge.net/projects/geoserver/files/GeoServer
     steps:
@@ -127,7 +135,10 @@ jobs:
   scan_image:
     runs-on: ubuntu-latest
     timeout-minutes: 20
-    if: github.actor != 'dependabot[bot]'  && contains(github.event.comment.body, '/skiprelease') && contains(github.event.comment.title, '[skiprelease]')
+    if: |
+      github.actor != 'dependabot[bot]' &&
+      (!contains(github.event.comment.body, '/skiprelease') ||
+      !contains(github.event.comment.title, '[skiprelease]'))
     needs: [build-geoserver-docker-image, run-scenario-tests]
     steps:
       - uses: actions/checkout@v4
@@ -157,7 +168,10 @@ jobs:
   run-scenario-tests:
     runs-on: ubuntu-latest
     timeout-minutes: 20
-    if: github.actor != 'dependabot[bot]'  && contains(github.event.comment.body, '/skiprelease') && contains(github.event.comment.title, '[skiprelease]')
+    if: |
+      github.actor != 'dependabot[bot]' &&
+      (!contains(github.event.comment.body, '/skiprelease') ||
+      !contains(github.event.comment.title, '[skiprelease]'))
     needs: [ build-geoserver-docker-image, build-activemq-docker-image]
     strategy:
       matrix:
@@ -200,7 +214,12 @@ jobs:
           bash ./test.sh
 
   push-internal-pr-images:
-    if: github.event_name == 'pull_request' && github.event.pull_request.base.repo.url == github.event.pull_request.head.repo.url && github.actor != 'dependabot[bot]'  && contains(github.event.comment.body, '/skiprelease') && contains(github.event.comment.title, '[skiprelease]')
+    if: |
+      github.event_name == 'pull_request' && 
+      github.event.pull_request.base.repo.url == github.event.pull_request.head.repo.url && 
+      github.actor != 'dependabot[bot]'  &&
+      (!contains(github.event.comment.body, '/skiprelease') ||
+      !contains(github.event.comment.title, '[skiprelease]'))
     runs-on: ubuntu-latest
     timeout-minutes: 20
     needs: [ build-geoserver-docker-image, run-scenario-tests ]

diff --git a/.github/workflows/deploy-image.yaml b/.github/workflows/deploy-image.yaml
@@ -12,7 +12,10 @@ on:
 #  contents: read
 jobs:
   deploy-image:
-    if: github.actor != 'dependabot[bot]'  && contains(github.event.comment.body, '/skiprelease') && contains(github.event.comment.title, '[skiprelease]')
+    if: |
+      github.actor != 'dependabot[bot]' &&
+      (!contains(github.event.comment.body, '/skiprelease') ||
+      !contains(github.event.comment.title, '[skiprelease]'))
     runs-on: ubuntu-latest
     timeout-minutes: 15
     env:
@@ -25,8 +28,10 @@ jobs:
           - image: 9.0.91-jdk11-temurin-focal
             javaHome: /opt/java/openjdk
         geoserverMinorVersion:
-          - minor: 25
-            patch: 2
+#          - minor: 25
+#            patch: 2
+          - minor: 24
+            patch: 4
         stablePluginBaseURL:
           # empty because it often changes, so it's better
           # to use the default one described in the Dockerfile

diff --git a/Dockerfile b/Dockerfile
@@ -101,6 +101,8 @@ COPY --from=geoserver-plugin-downloader /work/required_plugins.txt ${REQUIRED_PL
 COPY --from=geoserver-plugin-downloader /work/stable_plugins/*.zip ${STABLE_PLUGINS_DIR}/
 COPY --from=geoserver-plugin-downloader /work/community_plugins/*.zip ${COMMUNITY_PLUGINS_DIR}/
 COPY --from=geoserver-plugin-downloader /work/geoserver_war/geoserver.* ${REQUIRED_PLUGINS_DIR}/
+COPY --from=geoserver-plugin-downloader /work/community_plugins.txt ${COMMUNITY_PLUGINS_DIR}/
+COPY --from=geoserver-plugin-downloader /work/stable_plugins.txt ${STABLE_PLUGINS_DIR}/
 
 RUN echo ${GS_VERSION} > /scripts/geoserver_version.txt && echo ${STABLE_PLUGIN_BASE_URL} > /scripts/geoserver_gs_url.txt ;\
     chmod +x /scripts/*.sh;/scripts/setup.sh \