Docker profiles, container omission, fixed job cancellation

.github/workflows/ci.yaml

@@ -22,11 +22,14 @@ jobs:
 
       - name: run docker compose
         run: |
-          docker compose up -d --build
+          docker compose --profile pulsar up -d --build
 
-      - name: run docker compose dts
+      - name: install flask
+        run: pip install flask
+
+      - name: run upload_server.py
         run: |
-          docker compose -f docker/dts/docker-compose.yaml up -d
+          python tests/upload_server.py &
 
       - name: instal pytest
         run: pip install pytest

README.md

@@ -17,9 +17,23 @@ standard and distributing `TES` tasks execution to `Pulsar` applications.
 
 ### Deploy
 The most straightforward way to deploy the TESP is to use Docker Compose.
+
+#### API and DB services (default):
+```
+docker compose up -d
+```
+Expecting exetrnal Pulsar configured in `settings.toml` before the compose is run.
+So far only REST Pulsar communication is supported.
+
+#### With pulsar_rest service:
 ```
-docker compose up -d --build
+docker compose --profile pulsar up -d
 ```
+
+<br />
+<br />
+<br />
+
 Depending on you Docker and Docker Compose installation, you may need to use `docker-compose` (with hyphen) instead.
 
 You might encounter a timeout error in container runtime which can be solved by correct `mtu` configuration either in the `docker-compose.yaml`:
@@ -180,7 +194,11 @@ Service representing `TESP API` is configured to mount this project sources as a
 same command as is mentioned above. Therefore, any changes made to the sources in this repository will be immediately applied to the docker
 service as well, enabling live reloading which makes development within the `docker` environment very easy.
 ```shell
-docker-compose up -d
+docker compose up -d
+```
+Or
+```shell
+docker compose --profile pulsar up -d
 ```
 
 &nbsp;

docker-compose.yaml

@@ -39,15 +39,13 @@ services:
       dockerfile: Dockerfile
       target: development
     image: pulsar_rest
+    profiles: ["pulsar"]
     container_name: pulsar-rest
     privileged: true
     expose:
       - "8913"
     volumes:
       - ./docker/pulsar_rest/app.yml:/opt/pysetup/app.yml
-# DIND - problem with resource limitation, missing cgroups inside
-#      - ./docker/pulsar_rest/data/:/opt/pysetup/files/staging/
-# DOOD
       - /opt/pysetup/files/staging/:/opt/pysetup/files/staging/
       - /var/run/docker.sock:/var/run/docker.sock
 

docker/tesp_api/Dockerfile

@@ -2,7 +2,7 @@
 # See https://docs.docker.com/develop/develop-images/multistage-build/
 
 # Environment variables and base image
-FROM python:3.10-slim-buster as python-base
+FROM python:3.10-slim-bullseye as python-base
 ENV PYTHONUNBUFFERED=1 \
     PYTHONDONTWRITEBYTECODE=1 \
     PIP_NO_CACHE_DIR=off \

tesp_api/api/endpoints/task_endpoints.py

@@ -5,7 +5,7 @@
 from pymonad.promise import Promise
 from fastapi.params import Depends
 from fastapi import APIRouter, Body
-from fastapi.responses import Response
+from fastapi.responses import Response, JSONResponse
 
 from tesp_api.api.error import api_handle_error
 from tesp_api.service.event_dispatcher import dispatch_event
@@ -111,15 +111,18 @@ async def cancel_task(
             maybe_of(token_subject),
             ObjectId(id)
     ))).then(lambda get_tasks_args: task_repository.cancel_task(*get_tasks_args))\
-        .map(lambda task_id: Response(status_code=200, media_type="application/json"))\
+        .map(lambda task_id_maybe: 
+             # Use JSONResponse to ensure the body is "{}"
+             JSONResponse(content={}, status_code=200)
+        )\
         .catch(api_handle_error)
 
 
 @router.get("/service-info",
             responses={200: {"description": "Ok"}},
             description=descriptions["service-info"],
             response_model=TesServiceInfo)
-async def get_service_info() -> TesServiceInfo:
+async def get_service_info() -> TesServiceInfo: # FastAPI directly handles Pydantic model return
     return TesServiceInfo(
         id="fi.muni.cz.tesp",
         name="TESP",