Skip to content

Commit e6278b1

Browse files
author
Alex Grosu
committed
Merge remote-tracking branch 'origin/develop' into feat-rspy582/remove-deprecated-code
2 parents 5d73170 + eb8bdc5 commit e6278b1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+3404
-2294
lines changed

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ inputs:
2222
build_context_path:
2323
description: "'docker build' context path"
2424
required: true
25+
image_basename:
26+
description: Docker image base name
27+
default: ${{ github.repository }} # = owner/repository-name
2528
image_suffix:
2629
description: Docker image name suffix e.g. _services-cadip
2730
required: true
@@ -46,6 +49,9 @@ inputs:
4649
debug_mode:
4750
description: Add debug tools to the docker image
4851
required: false
52+
build_args:
53+
description: List of build-time variables
54+
required: false
4955

5056
outputs:
5157
docker_image:
@@ -78,7 +84,7 @@ runs:
7884
# Full Docker image name:tag as ghcr.io/RS-PYTHON/rs-server<suffix>:<version> in lowercase
7985
- id: docker_image
8086
run: |
81-
docker_image=${{ env.DOCKER_REGISTRY }}/${{ github.repository }}${{ inputs.image_suffix }}:${{ env.docker_version_name }}
87+
docker_image=${{ env.DOCKER_REGISTRY }}/${{ inputs.image_basename }}${{ inputs.image_suffix }}:${{ env.docker_version_name }}
8288
docker_image=${docker_image,,} # lowercase
8389
echo docker_image=${docker_image} >> $GITHUB_ENV
8490
echo docker_image=${docker_image} >> $GITHUB_OUTPUT
@@ -130,6 +136,7 @@ runs:
130136
tags: ${{ env.docker_image }}
131137
labels: ${{ steps.meta.outputs.labels }}
132138
push: false # push after the security scans below
139+
build-args: ${{ inputs.build_args }}
133140

134141
- name: Run Trivy vulnerability scanner
135142
uses: aquasecurity/trivy-action@master

.github/workflows/publish-binaries.yml

Lines changed: 44 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -261,15 +261,6 @@ jobs:
261261
fetch-depth: 0 # so that Dunamai produce the correct version
262262
- uses: ./.github/actions/install-python
263263

264-
# To pull ghcr.io/rs-python/apikey-manager
265-
# TODO: to be changed when the apikey manager will have its own container registry.
266-
- name: Log into Docker registry
267-
uses: docker/login-action@v3
268-
with:
269-
registry: ${{ env.DOCKER_REGISTRY }}
270-
username: ${{ github.actor }}
271-
password: ${{ secrets.GITHUB_TOKEN }}
272-
273264
- name: Generate the aggregated openapi.json/swagger
274265
run: |
275266
set -x
@@ -524,6 +515,50 @@ jobs:
524515
branch_name: ${{ needs.set-env.outputs.branch_name }}
525516
debug_mode: ${{ needs.set-env.outputs.debug_mode }}
526517

518+
dask-staging-local-img:
519+
if: github.actor != 'dependabot[bot]'
520+
runs-on: ubuntu-latest
521+
name: "'dask-gateway-server/staging/local' Docker image"
522+
# TODO: this has to be activated when the pydantic conflict is solved
523+
#needs: [set-env, services-common-whl, services-staging-whl]
524+
# TODO: this has to be deleted when the pydantic conflict is solved
525+
needs: [set-env, services-staging-whl]
526+
permissions: write-all
527+
outputs:
528+
docker_image: ${{ steps.publish-docker.outputs.docker_image}}
529+
steps:
530+
- uses: actions/checkout@v4
531+
532+
# Download .whl files into a local dir
533+
# TODO: the next 5 commented lines must be reactivated when the pydantic conflict is solved
534+
#- name: Download .whl dependencies
535+
# uses: actions/download-artifact@v4
536+
# with:
537+
# name: ${{ needs.services-common-whl.outputs.package_name }}
538+
# path: ./whl
539+
- name: Download .whl dependencies
540+
uses: actions/download-artifact@v4
541+
with:
542+
name: ${{ needs.services-staging-whl.outputs.package_name }}
543+
path: ./build_context_path
544+
545+
- id: publish-docker
546+
uses: ./.github/actions/publish-docker
547+
with:
548+
dockerfile: ./services/staging/.github/Dockerfile.dask-staging-local
549+
build_context_path: ./build_context_path
550+
image_basename: "${{ github.repository_owner }}/dask-gateway-server"
551+
image_suffix: /staging/local
552+
version_name: ${{ needs.services-staging-whl.outputs.version_name }}
553+
dockerhub_username: ${{ vars.DOCKERHUB_USERNAME }}
554+
dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }}
555+
github_token: ${{ secrets.GITHUB_TOKEN }}
556+
docker_tag: ${{ needs.set-env.outputs.docker_tag }}
557+
branch_name: ${{ needs.set-env.outputs.branch_name }}
558+
debug_mode: false
559+
build_args: |
560+
DASK_GATEWAY_TAG=2024.1.0
561+
527562
###########
528563
# TESTING #
529564
###########

CHANGELOG.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,30 @@ Changed
2424

2525
None
2626

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

docs/poetry.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)