Merge branch 'develop' into feat/rspy602-stac-fastapi-pgstac-updates

Author: Padeanu

.github/actions/publish-docker/action.yml

@@ -22,6 +22,9 @@ inputs:
   build_context_path:
     description: "'docker build' context path"
     required: true
+  image_basename:
+    description: Docker image base name
+    default: ${{ github.repository }} # = owner/repository-name
   image_suffix:
     description: Docker image name suffix e.g. _services-cadip
     required: true
@@ -46,6 +49,9 @@ inputs:
   debug_mode:
     description: Add debug tools to the docker image
     required: false
+  build_args:
+    description: List of build-time variables
+    required: false
 
 outputs:
   docker_image:
@@ -78,7 +84,7 @@ runs:
     # Full Docker image name:tag as ghcr.io/RS-PYTHON/rs-server<suffix>:<version> in lowercase
     - id: docker_image
       run: |
-        docker_image=${{ env.DOCKER_REGISTRY }}/${{ github.repository }}${{ inputs.image_suffix }}:${{ env.docker_version_name }}
+        docker_image=${{ env.DOCKER_REGISTRY }}/${{ inputs.image_basename }}${{ inputs.image_suffix }}:${{ env.docker_version_name }}
         docker_image=${docker_image,,} # lowercase
         echo docker_image=${docker_image} >> $GITHUB_ENV
         echo docker_image=${docker_image} >> $GITHUB_OUTPUT
@@ -130,6 +136,7 @@ runs:
         tags: ${{ env.docker_image }}
         labels: ${{ steps.meta.outputs.labels }}
         push: false # push after the security scans below
+        build-args: ${{ inputs.build_args }}
 
     - name: Run Trivy vulnerability scanner
       uses: aquasecurity/trivy-action@master

.github/workflows/publish-binaries.yml

@@ -261,15 +261,6 @@ jobs:
           fetch-depth: 0 # so that Dunamai produce the correct version
       - uses: ./.github/actions/install-python
 
-      # To pull ghcr.io/rs-python/apikey-manager
-      # TODO: to be changed when the apikey manager will have its own container registry.
-      - name: Log into Docker registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.DOCKER_REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Generate the aggregated openapi.json/swagger
         run: |
           set -x
@@ -493,7 +484,7 @@ jobs:
       - uses: actions/checkout@v4
 
       # Download .whl files into a local dir
-      # TODO: the following 5 comments have to be activated when the pydantic conflict is solved
+      # TODO: the next 5 commented lines must be reactivated when the pydantic conflict is solved
       #- name: Download .whl dependencies
       #  uses: actions/download-artifact@v4
       #  with:
@@ -524,6 +515,50 @@ jobs:
           branch_name: ${{ needs.set-env.outputs.branch_name }}
           debug_mode: ${{ needs.set-env.outputs.debug_mode }}
 
+  dask-staging-local-img:
+    if: github.actor != 'dependabot[bot]'
+    runs-on: ubuntu-latest
+    name: "'dask-gateway-server/staging/local' Docker image"
+    # TODO: this has to be activated when the pydantic conflict is solved
+    #needs: [set-env, services-common-whl, services-staging-whl]
+    # TODO: this has to be deleted when the pydantic conflict is solved
+    needs: [set-env, services-staging-whl]
+    permissions: write-all
+    outputs:
+      docker_image: ${{ steps.publish-docker.outputs.docker_image}}
+    steps:
+      - uses: actions/checkout@v4
+
+      # Download .whl files into a local dir
+      # TODO: the next 5 commented lines must be reactivated when the pydantic conflict is solved
+      #- name: Download .whl dependencies
+      #  uses: actions/download-artifact@v4
+      #  with:
+      #    name: ${{ needs.services-common-whl.outputs.package_name }}
+      #    path: ./whl
+      - name: Download .whl dependencies
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ needs.services-staging-whl.outputs.package_name }}
+          path: ./build_context_path
+
+      - id: publish-docker
+        uses: ./.github/actions/publish-docker
+        with:
+          dockerfile: ./services/staging/.github/Dockerfile.dask-staging-local
+          build_context_path: ./build_context_path
+          image_basename: "${{ github.repository_owner }}/dask-gateway-server"
+          image_suffix: /staging/local
+          version_name: ${{ needs.services-staging-whl.outputs.version_name }}
+          dockerhub_username: ${{ vars.DOCKERHUB_USERNAME }}
+          dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          docker_tag: ${{ needs.set-env.outputs.docker_tag }}
+          branch_name: ${{ needs.set-env.outputs.branch_name }}
+          debug_mode: false
+          build_args: |
+            DASK_GATEWAY_TAG=2024.1.0
+
   ###########
   # TESTING #
   ###########
@@ -547,12 +582,8 @@ jobs:
         run: |
           set -x
 
-          # Clone the rs-demo repository.
-          # Use the ssh public key from: https://github.com/RS-PYTHON/rs-demo/settings/keys
-          # and the private key from: https://github.com/RS-PYTHON/rs-server/settings/secrets/actions
-          eval "$(ssh-agent -s)"
-          ssh-add - <<< "${{ secrets.RS_DEMO_PRIVATE_SSH_KEY }}"
-          git clone [email protected]:RS-PYTHON/rs-demo.git
+          # Clone the rs-demo repository
+          git clone https://github.com/RS-PYTHON/rs-demo.git
 
           # Try to checkout in rs-demo the same branch name than in rs-server.
           # If the branch doesn't exist, it's ok, we stay on the default branch.

CHANGELOG.md

@@ -24,6 +24,30 @@ Changed
 
 None
 
+[0.2a10] - Sprint 20 - 2025-02-12
+================================
+
+## Added
+
+- RSPY-493: Search/Sort by any attribute from external data sources
+- RSPY-517: Remove unwanted dependencies to Prefect
+- RSPY-530: Implement staging rs client
+- RSPY-550: Handle null geometries
+- RSPY-570: Integrate DPR empty processor
+- RSPY-577: OVH: deployment of cluster nodes and managed kubernetes
+- RSPY-580: OVH : implements a playbook to start/stop the cluster nodes
+- RSPY-593: Sprint 20 corrections of issues
+- RSPY-596: Update to stac-browser 3.3
+
+## Fixed
+
+- RSPY-448: Staging : status for GET jobs/WRONG_ID/results is 200 and not 404
+- RSPY-544: Invalid catalog download links of staged products (bad id + cluster local domain name)
+- RSPY-578: 'limit' parameter is ignored in cadip search, creating too large requests to stations
+- RSPY-591: Wazuh agents are not connected
+- RSPY-597: config error: datetime parameter ignored in POST /cadip/search & /auxip/search
+- RSPY-598: CADIP stations and ADGS don't support lte/gte operators
+
 [0.2a9] - Sprint 19 - 2025-01-15
 ================================