Merge branch 'develop' into kartoza-dont-sideload-mscorefonts

.github/workflows/build-latest.yaml

@@ -21,6 +21,7 @@ jobs:
   build-activemq-docker-image:
     runs-on: ubuntu-latest
     timeout-minutes: 20
+    if: github.actor != 'dependabot[bot]'
     steps:
       - uses: actions/checkout@v4
       - name: Set up QEMU
@@ -50,6 +51,7 @@ jobs:
   build-docker-image:
     runs-on: ubuntu-latest
     timeout-minutes: 20
+    if: github.actor != 'dependabot[bot]'
     strategy:
       matrix:
         geoserverMajorVersion:
@@ -121,6 +123,7 @@ jobs:
   scan_image:
     runs-on: ubuntu-latest
     timeout-minutes: 20
+    if: github.actor != 'dependabot[bot]'
     needs: [build-docker-image, run-scenario-tests]
     steps:
       - uses: actions/checkout@v4
@@ -144,13 +147,14 @@ jobs:
           vuln-type: 'os,library'
 
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v2
+        uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: 'trivy-results.sarif'
 
   run-scenario-tests:
     runs-on: ubuntu-latest
     timeout-minutes: 20
+    if: github.actor != 'dependabot[bot]'
     needs: [ build-docker-image, build-activemq-docker-image]
     strategy:
       matrix:
@@ -191,7 +195,7 @@ 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
+    if: github.event_name == 'pull_request' && github.event.pull_request.base.repo.url == github.event.pull_request.head.repo.url && github.actor != 'dependabot[bot]'
     runs-on: ubuntu-latest
     timeout-minutes: 20
     needs: [ build-docker-image, run-scenario-tests ]

.github/workflows/deploy-image.yaml

@@ -10,6 +10,7 @@ on:
       - completed
 jobs:
   deploy-image:
+    if: github.actor != 'dependabot[bot]'
     runs-on: ubuntu-latest
     timeout-minutes: 20
     env:

Dockerfile

@@ -24,7 +24,6 @@ RUN set -eux; \
         ttf-bitstream-vera ttf-sjfonts tv-fonts libapr1-dev libssl-dev git \
         wget zip unzip curl xsltproc certbot  cabextract gettext postgresql-client figlet gosu gdal-bin libgdal-java; \
       dpkg-divert --local --rename --add /sbin/initctl \
-      && (echo "Yes, do as I say!" | apt-get remove --force-yes login) \
       && apt-get clean \
       && rm -rf /var/lib/apt/lists/*; \
       # verify that the binary works

build_data/gwc-gs.xml

@@ -33,10 +33,12 @@
     <string>image/jpeg</string>
   </defaultCoverageCacheFormats>
   <defaultVectorCacheFormats>
+    <string>application/vnd.mapbox-vector-tile</string>
     <string>image/png</string>
     <string>image/jpeg</string>
   </defaultVectorCacheFormats>
   <defaultOtherCacheFormats>
+    <string>application/vnd.mapbox-vector-tile</string>
     <string>image/png</string>
     <string>image/jpeg</string>
   </defaultOtherCacheFormats>

scripts/env-data.sh

@@ -15,7 +15,7 @@ if [ -z "${OPTIMIZE_LINE_WIDTH}" ]; then
 fi
 
 if [ -z "${WMS_DIR_INTEGRATION}" ]; then
-  WMS_DIR_INTEGRATION=false
+  WMS_DIR_INTEGRATION=true
 fi
 
 if [ -z "${REQUIRE_TILED_PARAMETER}" ]; then