Hotfixes into unstable

.github/workflows/containerbuild.yml

@@ -79,7 +79,7 @@ jobs:
         with:
           skip_after_successful_duplicate: false
           github_token: ${{ github.token }}
-          paths: '["k8s/images/nginx/*", ".github/workflows/containerbuild.yml"]'
+          paths: '["docker/Dockerfile.nginx.prod", "docker/nginx/*", ".github/workflows/containerbuild.yml"]'
 
   build_nginx:
     name: nginx - test build of nginx Docker image
@@ -100,6 +100,6 @@ jobs:
       uses: docker/build-push-action@v6
       with:
         context: ./
-        file: ./k8s/images/nginx/Dockerfile
+        file: ./docker/Dockerfile.nginx.prod
         platforms: linux/amd64
         push: false

Makefile

@@ -171,11 +171,7 @@ dcbuild:
 	$(DOCKER_COMPOSE) build
 
 dcup: .docker/minio .docker/postgres
-	# run all services except for cloudprober
-	$(DOCKER_COMPOSE) up studio-app celery-worker
-
-dcup-cloudprober: .docker/minio .docker/postgres
-	# run all services including cloudprober
+	# run all services
 	$(DOCKER_COMPOSE) up
 
 dcdown:

contentcuration/contentcuration/settings.py

@@ -348,6 +348,11 @@ def gettext(s):
     "result_serializer": "json",
     "result_extended": True,
     "worker_send_task_events": True,
+    # Graceful shutdown: allow 28 seconds for tasks to complete before forced termination
+    # This is 2 seconds less than Kubernetes terminationGracePeriodSeconds (30s)
+    "worker_soft_shutdown_timeout": int(
+        os.getenv("CELERY_WORKER_SOFT_SHUTDOWN_TIMEOUT", "28")
+    ),
 }
 
 # When cleaning up orphan nodes, only clean up any that have been last modified