🐛 fixed issue where notifications service would not start in development mode (#7580)

Co-authored-by: Andrei Neagu <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

Author: 3 people

Makefile

@@ -74,6 +74,7 @@ export STORAGE_API_VERSION    := $(shell cat $(CURDIR)/services/storage/VERSION)
 export INVITATIONS_API_VERSION  := $(shell cat $(CURDIR)/services/invitations/VERSION)
 export PAYMENTS_API_VERSION  := $(shell cat $(CURDIR)/services/payments/VERSION)
 export DYNAMIC_SCHEDULER_API_VERSION  := $(shell cat $(CURDIR)/services/dynamic-scheduler/VERSION)
+export NOTIFICATIONS_API_VERSION  := $(shell cat $(CURDIR)/services/notifications/VERSION)
 export DATCORE_ADAPTER_API_VERSION    := $(shell cat $(CURDIR)/services/datcore-adapter/VERSION)
 export WEBSERVER_API_VERSION  := $(shell cat $(CURDIR)/services/web/server/VERSION)
 
@@ -611,6 +612,7 @@ settings-schema.json: ## [container] dumps json-schema settings of all services
 	@$(MAKE_C) services/invitations $@
 	@$(MAKE_C) services/payments $@
 	@$(MAKE_C) services/dynamic-scheduler $@
+	@$(MAKE_C) services/notifications $@
 	@$(MAKE_C) services/storage $@
 	@$(MAKE_C) services/web/server $@
 

services/docker-compose-build.yml

@@ -179,12 +179,13 @@ services:
         - ${DOCKER_REGISTRY:-itisfoundation}/notifications:master-github-latest
         - ${DOCKER_REGISTRY:-itisfoundation}/notifications:staging-github-latest
         - ${DOCKER_REGISTRY:-itisfoundation}/notifications:release-github-latest
-      target: production
+      target: ${BUILD_TARGET:?build_target_required}
       labels:
         org.label-schema.schema-version: "1.0"
         org.opencontainers.image.created: "${BUILD_DATE}"
         org.opencontainers.image.source: "${VCS_URL}"
         org.opencontainers.image.revision: "${VCS_REF}"
+        io.osparc.api-version: "${NOTIFICATIONS_API_VERSION}"
 
   resource-usage-tracker:
     image: local/resource-usage-tracker:${BUILD_TARGET:?build_target_required}

services/docker-compose.local.yml

@@ -91,7 +91,7 @@ services:
   notifications:
     environment:
       <<: *common_environment
-      INVITATIONS_REMOTE_DEBUGGING_PORT : 3000
+      NOTIFICATIONS_REMOTE_DEBUGGING_PORT : 3000
     ports:
       - "8015:8000"
       - "3023:3000"

services/dynamic-scheduler/Dockerfile

@@ -56,8 +56,6 @@ ENV PYTHONDONTWRITEBYTECODE=1 \
 # those from our virtualenv.
 ENV PATH="${VIRTUAL_ENV}/bin:$PATH"
 
-EXPOSE 8000
-
 # -------------------------- Build stage -------------------
 # Installs build/package management tools and third party dependencies
 #
@@ -91,7 +89,6 @@ WORKDIR /build
 
 
 
-
 # --------------------------Prod-depends-only stage -------------------
 # This stage is for production only dependencies that get partially wiped out afterwards (final docker image concerns)
 #
@@ -100,7 +97,7 @@ WORKDIR /build
 #
 FROM build AS prod-only-deps
 
-ENV SC_BUILD_TARGET prod-only-deps
+ENV SC_BUILD_TARGET=prod-only-deps
 
 WORKDIR /build/services/dynamic-scheduler
 
@@ -153,6 +150,7 @@ HEALTHCHECK \
 ENTRYPOINT [ "/bin/sh", "services/dynamic-scheduler/docker/entrypoint.sh" ]
 CMD ["/bin/sh", "services/dynamic-scheduler/docker/boot.sh"]
 
+EXPOSE 8000
 
 # --------------------------Development stage -------------------
 # Source code accessible in host but runs in container
@@ -171,5 +169,8 @@ WORKDIR /devel
 
 RUN chown -R scu:scu "${VIRTUAL_ENV}"
 
+EXPOSE 8000
+EXPOSE 3000
+
 ENTRYPOINT ["/bin/sh", "services/dynamic-scheduler/docker/entrypoint.sh"]
 CMD ["/bin/sh", "services/dynamic-scheduler/docker/boot.sh"]

services/notifications/Dockerfile

@@ -3,12 +3,10 @@
 # Define arguments in the global scope
 ARG PYTHON_VERSION="3.11.9"
 ARG UV_VERSION="0.6"
-
 FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
 # we docker image is built based on debian
 FROM python:${PYTHON_VERSION}-slim-bookworm AS base
 
-
 #
 #  USAGE:
 #     cd services/notifications
@@ -131,7 +129,6 @@ WORKDIR /home/scu
 
 # ensure home folder is read/writable for user scu
 RUN chown -R scu /home/scu
-
 # Starting from clean base image, copies pre-installed virtualenv from prod-only-deps
 COPY --chown=scu:scu --from=prod-only-deps  ${VIRTUAL_ENV} ${VIRTUAL_ENV}
 
@@ -140,17 +137,19 @@ COPY --chown=scu:scu services/notifications/docker services/notifications/docker
 RUN chmod +x services/notifications/docker/*.sh
 
 
-HEALTHCHECK --interval=30s \
-  --timeout=20s \
-  --start-period=30s \
-  --retries=3 \
+# https://docs.docker.com/reference/dockerfile/#healthcheck
+HEALTHCHECK \
+  --interval=10s \
+  --timeout=5s \
+  --start-period=20s \
+  --start-interval=1s \
+  --retries=5 \
   CMD ["python3", "services/notifications/docker/healthcheck.py", "http://localhost:8000/"]
 
-EXPOSE 8000
-
 ENTRYPOINT [ "/bin/sh", "services/notifications/docker/entrypoint.sh" ]
 CMD ["/bin/sh", "services/notifications/docker/boot.sh"]
 
+EXPOSE 8000
 
 # --------------------------Development stage -------------------
 # Source code accessible in host but runs in container

services/notifications/docker/boot.sh

@@ -38,8 +38,8 @@ fi
 #
 # RUNNING application
 #
+
 APP_LOG_LEVEL=${LOGLEVEL:-${LOG_LEVEL:-${LOGLEVEL:-INFO}}}
-NOTIFICATIONS_SERVER_REMOTE_DEBUG_PORT=3000
 SERVER_LOG_LEVEL=$(echo "${APP_LOG_LEVEL}" | tr '[:upper:]' '[:lower:]')
 echo "$INFO" "Log-level app/server: $APP_LOG_LEVEL/$SERVER_LOG_LEVEL"
 
@@ -48,7 +48,7 @@ if [ "${SC_BOOT_MODE}" = "debug" ]; then
 
   exec sh -c "
     cd services/notifications/src/simcore_service_notifications && \
-    python -m debugpy --listen 0.0.0.0:${NOTIFICATIONS_SERVER_REMOTE_DEBUG_PORT} -m uvicorn main:the_app \
+    python -m debugpy --listen 0.0.0.0:${NOTIFICATIONS_REMOTE_DEBUGGING_PORT} -m uvicorn main:the_app \
       --host 0.0.0.0 \
       --port 8000 \
       --reload \