Merge branch 'gpu-resource-allocation' into refactor-jupyterhub-customization

Author: mishaschwartz

.bumpversion.toml

@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "2.20.1"
+current_version = "2.20.2"
 commit = true
 tag = false
 tag_name = "{new_version}"

.github/workflows/greetings.yml

@@ -6,14 +6,14 @@ jobs:
   greeting:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/first-interaction@753c925c8d1ac6fede23781875376600628d9b5d # v3.0.0
+    - uses: actions/first-interaction@1c4688942c71f71d4f5502a26ea67c331730fa4d # v3.1.0
       with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        issue-message: >
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        issue_message: >
           Thanks for submitting an issue.
 
           Please make sure to provide enough details for us to be able to replicate your issue or understand your question.
-        pr-message: >
+        pr_message: >
           Thanks for submitting a PR.
 
           Make sure you have looked at [CONTRIBUTING](https://github.com/bird-house/birdhouse-deploy/blob/master/CONTRIBUTING.rst) guidelines.

.github/workflows/tests.yml

@@ -15,11 +15,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           persist-credentials: false
       - name: Set up Python3
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
         with:
           python-version: "3.11"
           cache: 'pip'

CHANGES.md

@@ -88,14 +88,27 @@
   c.MagpieAuthenticator.blocked_users.add("${CATALOG_USERNAME}")
   ```
 
+[2.20.2](https://github.com/bird-house/birdhouse-deploy/tree/2.20.2) (2026-01-05)
+------------------------------------------------------------------------------------------------------------------
+
+## Changes
+
+- STAC API: Improve reported service links.
+
+  - Add `STAC_LICENSE_URL` to define the relevant license metadata location of the selected implementation.
+  - Add `STAC_OPENAPI_SPEC_PATH` and `STAC_OPENAPI_DOCS_PATH` to define endpoints of OpenAPI specification.
+  - Update the `/services/stac` response to provide more metadata links, including license details and better
+    API metadata references. Notably, replace the *generic* STAC API Core OpenAPI definition by the 
+    implementation-specific definition self-served by the selected docker image to document API extensions.
+
 [2.20.1](https://github.com/bird-house/birdhouse-deploy/tree/2.20.1) (2025-12-16)
 ------------------------------------------------------------------------------------------------------------------
 
 ## Fixes
 
 - Add log rotation scheduler job for the nginx logs
 
-  Currently the nginx logs are not rotated so they can build up to quite a large size.
+  Currently, the nginx logs are not rotated so they can build up to quite a large size.
 
   Previously, they were rotated by the `canarie-api` component but that is no longer a required
   component and CanarieAPI hasn't handled log rotation since CanarieAPI version 1.0.0 (see 

Makefile

@@ -8,7 +8,7 @@ override BIRDHOUSE_MAKE_DIR := $(shell realpath -P $$(dirname $(BIRDHOUSE_MAKE_C
 # Generic variables
 override SHELL       := bash
 override APP_NAME    := birdhouse-deploy
-override APP_VERSION := 2.20.1
+override APP_VERSION := 2.20.2
 
 # utility to remove comments after value of an option variable
 override clean_opt = $(shell echo "$(1)" | $(_SED) -r -e "s/[ '$'\t'']+$$//g")

README.rst

@@ -18,13 +18,13 @@ for a full-fledged production platform.
     * - citation
       - | |citation|
 
-.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.20.1.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.20.2.svg
     :alt: Commits since latest release
-    :target: https://github.com/bird-house/birdhouse-deploy/compare/2.20.1...master
+    :target: https://github.com/bird-house/birdhouse-deploy/compare/2.20.2...master
 
-.. |latest-version| image:: https://img.shields.io/badge/tag-2.20.1-blue.svg?style=flat
+.. |latest-version| image:: https://img.shields.io/badge/tag-2.20.2-blue.svg?style=flat
     :alt: Latest Tag
-    :target: https://github.com/bird-house/birdhouse-deploy/tree/2.20.1
+    :target: https://github.com/bird-house/birdhouse-deploy/tree/2.20.2
 
 .. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest
     :alt: ReadTheDocs Build Status (latest version)

RELEASE.txt

@@ -1 +1 @@
-2.20.1 2025-12-16T18:09:59Z
+2.20.2 2026-01-05T18:34:59Z

birdhouse/components/canarie-api/docker_configuration.py.template

@@ -108,8 +108,8 @@ SERVICES = {
             # NOTE:
             #   Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
             #   Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
-            'version': '2.20.1',
-            'releaseTime': '2025-12-16T18:09:59Z',
+            'version': '2.20.2',
+            'releaseTime': '2026-01-05T18:34:59Z',
             'institution': '${BIRDHOUSE_INSTITUTION}',
             'researchSubject': '${BIRDHOUSE_SUBJECT}',
             'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}',
@@ -141,8 +141,8 @@ PLATFORMS = {
             # NOTE:
             #   Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
             #   Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
-            'version': '2.20.1',
-            'releaseTime': '2025-12-16T18:09:59Z',
+            'version': '2.20.2',
+            'releaseTime': '2026-01-05T18:34:59Z',
             'institution': '${BIRDHOUSE_INSTITUTION}',
             'researchSubject': '${BIRDHOUSE_SUBJECT}',
             'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}',

birdhouse/components/stac/default.env

@@ -20,6 +20,10 @@ export STAC_PGPASSWORD='${BIRDHOUSE_POSTGRES_PASSWORD}'
 export STAC_VERSION=6.0.0-crim-2.1.0
 export STAC_IMAGE='ghcr.io/crim-ca/stac-app:2.1.0'
 export STAC_IMAGE_URI='${STAC_IMAGE}'
+export STAC_LICENSE_URL='https://raw.githubusercontent.com/crim-ca/stac-app/refs/heads/main/LICENSE'
+export STAC_OPENAPI_SPEC_PATH='/api'
+export STAC_OPENAPI_DOCS_PATH='/api.html'
+
 # database SQL schemas must be aligned with STAC_VERSION
 # there versions are not "equal", check compatibilities on https://github.com/stac-utils/stac-fastapi-pgstac
 export STAC_DB_VERSION=0.9.8
@@ -65,6 +69,14 @@ EXTRA_VARS='
   $STAC_POSTGRES_PASSWORD
   $STAC_PGUSER
   $STAC_PGPASSWORD
+  $STAC_VERSION
+  $STAC_IMAGE
+  $STAC_IMAGE_URI
+  $STAC_DB_IMAGE
+  $STAC_MIGRATION_IMAGE
+  $STAC_LICENSE_URL
+  $STAC_OPENAPI_SPEC_PATH
+  $STAC_OPENAPI_DOCS_PATH
 '
 # extend the original 'VARS' from 'birdhouse/birdhouse-compose.sh' to employ them for template substitution
 # adding them to 'VARS', they will also be validated in case of override of 'default.env' using 'env.local'
@@ -89,16 +101,11 @@ export DELAYED_EVAL="
 
 OPTIONAL_VARS="
   $OPTIONAL_VARS
-  \$STAC_VERSION
-  \$STAC_IMAGE
-  \$STAC_IMAGE_URI
   \$STAC_DB_VERSION
   \$STAC_DB_TAGGED
   \$STAC_DB_DOCKER
-  \$STAC_DB_IMAGE
   \$STAC_MIGRATION_VERSION
   \$STAC_MIGRATION_TAGGED
   \$STAC_MIGRATION_DOCKER
-  \$STAC_MIGRATION_IMAGE
   \$STAC_ADDITIONAL_CORS_ORIGINS
 "

birdhouse/components/stac/docker-compose-extra.yml

@@ -21,8 +21,8 @@ services:
       - POSTGRES_HOST_WRITER=stac-db
       - POSTGRES_PORT=5432
       - ROUTER_PREFIX=/stac
-      - OPENAPI_URL=/stac/api
-      - DOCS_URL=/stac/api.html
+      - OPENAPI_URL=/stac${STAC_OPENAPI_SPEC_PATH}
+      - DOCS_URL=/stac${STAC_OPENAPI_DOCS_PATH}
     logging: *default-logging
     restart: always
     healthcheck: