From f93162a8c9ad8cf2d371351d6d1bd534f69bae7b Mon Sep 17 00:00:00 2001 From: Ornella33 Date: Mon, 11 May 2026 14:09:48 +0200 Subject: [PATCH] Align API base paths Previously, the repository API used the base path `api/3.1` in `server/app/interfaces/repository.py`, while the Dockerfile defined `api/3.0`. In contrast, the registry and discovery APIs used `api/3.1.1` consistently in both their Dockerfiles and the corresponding `registry.py` and `discovery.py` files. This change consolidates the base paths for the repository, registry, and discovery APIs to `api/3.1`. --- server/app/interfaces/discovery.py | 2 +- server/app/interfaces/registry.py | 2 +- server/docker/discovery/Dockerfile | 2 +- server/docker/registry/Dockerfile | 2 +- server/docker/repository/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/app/interfaces/discovery.py b/server/app/interfaces/discovery.py index 218fdc8f..a6e43361 100644 --- a/server/app/interfaces/discovery.py +++ b/server/app/interfaces/discovery.py @@ -89,7 +89,7 @@ def to_file(self, filename: str) -> None: class DiscoveryAPI(BaseWSGIApp): - def __init__(self, persistent_store: DiscoveryStore, base_path: str = "/api/v3.1.1"): + def __init__(self, persistent_store: DiscoveryStore, base_path: str = "/api/v3.1"): self.persistent_store: DiscoveryStore = persistent_store self.url_map = werkzeug.routing.Map( [ diff --git a/server/app/interfaces/registry.py b/server/app/interfaces/registry.py index 30c5cd91..8494b629 100644 --- a/server/app/interfaces/registry.py +++ b/server/app/interfaces/registry.py @@ -29,7 +29,7 @@ class RegistryAPI(ObjectStoreWSGIApp): - def __init__(self, object_store: model.AbstractObjectStore, base_path: str = "/api/v3.1.1"): + def __init__(self, object_store: model.AbstractObjectStore, base_path: str = "/api/v3.1"): self.object_store: model.AbstractObjectStore = object_store self.url_map = werkzeug.routing.Map( [ diff --git a/server/docker/discovery/Dockerfile b/server/docker/discovery/Dockerfile index 8bc377e1..66c9618e 100644 --- a/server/docker/discovery/Dockerfile +++ b/server/docker/discovery/Dockerfile @@ -33,7 +33,7 @@ ENV NGINX_MAX_UPLOAD=1M ENV NGINX_WORKER_PROCESSES=1 ENV LISTEN_PORT=80 ENV CLIENT_BODY_BUFFER_SIZE=1M -ENV API_BASE_PATH=/api/v3.1.1/ +ENV API_BASE_PATH=/api/v3.1/ # Copy the entrypoint that will generate Nginx additional configs COPY server/docker/common/entrypoint.sh /entrypoint.sh diff --git a/server/docker/registry/Dockerfile b/server/docker/registry/Dockerfile index e9d71600..df367f2d 100644 --- a/server/docker/registry/Dockerfile +++ b/server/docker/registry/Dockerfile @@ -34,7 +34,7 @@ ENV NGINX_MAX_UPLOAD=1M ENV NGINX_WORKER_PROCESSES=1 ENV LISTEN_PORT=80 ENV CLIENT_BODY_BUFFER_SIZE=1M -ENV API_BASE_PATH=/api/v3.1.1/ +ENV API_BASE_PATH=/api/v3.1/ # Default values for the storage envs ENV INPUT=/input diff --git a/server/docker/repository/Dockerfile b/server/docker/repository/Dockerfile index bf701c80..bc58e3e6 100644 --- a/server/docker/repository/Dockerfile +++ b/server/docker/repository/Dockerfile @@ -35,7 +35,7 @@ ENV NGINX_MAX_UPLOAD=1M ENV NGINX_WORKER_PROCESSES=1 ENV LISTEN_PORT=80 ENV CLIENT_BODY_BUFFER_SIZE=1M -ENV API_BASE_PATH=/api/v3.0/ +ENV API_BASE_PATH=/api/v3.1/ # Default values for the storage envs ENV INPUT=/input