moved installation of debugpy to boot script

sanderegg · sanderegg · commit 5e9b5d7dca80 · 2024-10-22T14:29:27.000+02:00
diff --git a/services/agent/docker/boot.sh b/services/agent/docker/boot.sh
@@ -30,6 +30,11 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
   uv pip list
 fi
 
+if [ "${SC_BOOT_MODE}" = "debug" ]; then
+  # NOTE: production does NOT pre-installs debugpy
+  uv pip install --no-cache-dir debugpy
+fi
+
 #
 # RUNNING application
 #
diff --git a/services/agent/docker/entrypoint.sh b/services/agent/docker/entrypoint.sh
@@ -63,11 +63,6 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
   fi
 fi
 
-if [ "${SC_BOOT_MODE}" = "debug" ]; then
-  # NOTE: production does NOT pre-installs debugpy
-  uv pip install --no-cache-dir debugpy
-fi
-
 # Appends docker group if socket is mounted
 DOCKER_MOUNT=/var/run/docker.sock
 if stat $DOCKER_MOUNT >/dev/null 2>&1; then
diff --git a/services/api-server/docker/boot.sh b/services/api-server/docker/boot.sh
@@ -25,6 +25,11 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
   uv pip list
 fi
 
+if [ "${SC_BOOT_MODE}" = "debug" ]; then
+  # NOTE: production does NOT pre-installs debugpy
+  uv pip install --no-cache-dir debugpy
+fi
+
 # RUNNING application ----------------------------------------
 APP_LOG_LEVEL=${API_SERVER_LOGLEVEL:-${LOG_LEVEL:-${LOGLEVEL:-INFO}}}
 SERVER_LOG_LEVEL=$(echo "${APP_LOG_LEVEL}" | tr '[:upper:]' '[:lower:]')
diff --git a/services/api-server/docker/entrypoint.sh b/services/api-server/docker/entrypoint.sh
@@ -64,11 +64,6 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
   fi
 fi
 
-if [ "${SC_BOOT_MODE}" = "debug" ]; then
-  # NOTE: production does NOT pre-installs ptvsd
-  uv pip install --no-cache-dir debugpy
-fi
-
 echo "$INFO Starting $* ..."
 echo "  $SC_USER_NAME rights    : $(id "$SC_USER_NAME")"
 echo "  local dir : $(ls -al)"
diff --git a/services/autoscaling/docker/boot.sh b/services/autoscaling/docker/boot.sh
@@ -29,6 +29,11 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
   uv pip list
 fi
 
+if [ "${SC_BOOT_MODE}" = "debug" ]; then
+  # NOTE: production does NOT pre-installs debugpy
+  uv pip install --no-cache-dir debugpy
+fi
+
 #
 # RUNNING application
 #
diff --git a/services/autoscaling/docker/entrypoint.sh b/services/autoscaling/docker/entrypoint.sh
@@ -70,11 +70,6 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
   fi
 fi
 
-if [ "${SC_BOOT_MODE}" = "debug" ]; then
-  # NOTE: production does NOT pre-installs debugpy
-  uv pip install --no-cache-dir debugpy
-fi
-
 # Appends docker group if socket is mounted
 DOCKER_MOUNT=/var/run/docker.sock
 if stat $DOCKER_MOUNT >/dev/null 2>&1; then
diff --git a/services/catalog/docker/boot.sh b/services/catalog/docker/boot.sh
@@ -25,6 +25,11 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
   uv pip list
 fi
 
+if [ "${SC_BOOT_MODE}" = "debug" ]; then
+  # NOTE: production does NOT pre-installs debugpy
+  uv pip install --no-cache-dir debugpy
+fi
+
 # RUNNING application ----------------------------------------
 APP_LOG_LEVEL=${CATALOG_LOGLEVEL:-${LOG_LEVEL:-${LOGLEVEL:-INFO}}}
 SERVER_LOG_LEVEL=$(echo "${APP_LOG_LEVEL}" | tr '[:upper:]' '[:lower:]')
diff --git a/services/catalog/docker/entrypoint.sh b/services/catalog/docker/entrypoint.sh
@@ -63,11 +63,6 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
   fi
 fi
 
-if [ "${SC_BOOT_MODE}" = "debug" ]; then
-  # NOTE: production does NOT pre-installs ptvsd
-  uv pip install --no-cache-dir debugpy
-fi
-
 echo "$INFO Starting $* ..."
 echo "  $SC_USER_NAME rights    : $(id "$SC_USER_NAME")"
 echo "  local dir : $(ls -al)"
diff --git a/services/clusters-keeper/docker/boot.sh b/services/clusters-keeper/docker/boot.sh
@@ -30,6 +30,11 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
   uv pip list
 fi
 
+if [ "${SC_BOOT_MODE}" = "debug" ]; then
+  # NOTE: production does NOT pre-installs debugpy
+  uv pip install --no-cache-dir debugpy
+fi
+
 #
 # RUNNING application
 #
diff --git a/services/dask-sidecar/docker/boot.sh b/services/dask-sidecar/docker/boot.sh
@@ -31,6 +31,11 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
   uv pip list
 fi
 
+if [ "${SC_BOOT_MODE}" = "debug" ]; then
+  # NOTE: production does NOT pre-installs debugpy
+  uv pip install --no-cache-dir debugpy
+fi
+
 # RUNNING application ----------------------------------------
 #
 # - If DASK_START_AS_SCHEDULER is set, then it boots as scheduler otherwise as worker
diff --git a/services/dask-sidecar/docker/entrypoint.sh b/services/dask-sidecar/docker/entrypoint.sh
@@ -65,11 +65,6 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
   fi
 fi
 
-if [ "${SC_BOOT_MODE}" = "debug" ]; then
-  # NOTE: production does NOT pre-installs debugpy
-  uv pip install --no-cache-dir debugpy
-fi
-
 if [ ${DASK_START_AS_SCHEDULER+x} ]; then
 
   echo "$INFO Starting $* as SCHEDULER ..."
diff --git a/services/datcore-adapter/docker/boot.sh b/services/datcore-adapter/docker/boot.sh
@@ -30,6 +30,11 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
   uv pip list
 fi
 
+if [ "${SC_BOOT_MODE}" = "debug" ]; then
+  # NOTE: production does NOT pre-installs debugpy
+  uv pip install --no-cache-dir debugpy
+fi
+
 # RUNNING application ----------------------------------------
 APP_LOG_LEVEL=${DATCORE_ADAPTER_LOGLEVEL:-${LOG_LEVEL:-${LOGLEVEL:-INFO}}}
 SERVER_LOG_LEVEL=$(echo "${APP_LOG_LEVEL}" | tr '[:upper:]' '[:lower:]')
diff --git a/services/datcore-adapter/docker/entrypoint.sh b/services/datcore-adapter/docker/entrypoint.sh
@@ -63,11 +63,6 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
   fi
 fi
 
-if [ "${SC_BOOT_MODE}" = "debug" ]; then
-  # NOTE: production does NOT pre-installs debugpy
-  uv pip install --no-cache-dir debugpy
-fi
-
 echo "$INFO Starting $* ..."
 echo "  $SC_USER_NAME rights    : $(id "$SC_USER_NAME")"
 echo "  local dir : $(ls -al)"
diff --git a/services/director-v2/docker/boot.sh b/services/director-v2/docker/boot.sh
@@ -30,6 +30,11 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
   uv pip list
 fi
 
+if [ "${SC_BOOT_MODE}" = "debug" ]; then
+  # NOTE: production does NOT pre-installs debugpy
+  uv pip install --no-cache-dir debugpy
+fi
+
 #
 # RUNNING application
 #
diff --git a/services/director-v2/docker/entrypoint.sh b/services/director-v2/docker/entrypoint.sh
@@ -70,11 +70,6 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
   fi
 fi
 
-if [ "${SC_BOOT_MODE}" = "debug" ]; then
-  # NOTE: production does NOT pre-installs debugpy
-  uv pip install --no-cache-dir debugpy
-fi
-
 # Appends docker group if socket is mounted
 DOCKER_MOUNT=/var/run/docker.sock
 if stat $DOCKER_MOUNT >/dev/null 2>&1; then
diff --git a/services/dynamic-scheduler/docker/boot.sh b/services/dynamic-scheduler/docker/boot.sh
@@ -30,6 +30,11 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
   uv pip list
 fi
 
+if [ "${SC_BOOT_MODE}" = "debug" ]; then
+  # NOTE: production does NOT pre-installs debugpy
+  uv pip install --no-cache-dir debugpy
+fi
+
 #
 # RUNNING application
 #
diff --git a/services/dynamic-scheduler/docker/entrypoint.sh b/services/dynamic-scheduler/docker/entrypoint.sh
@@ -63,11 +63,6 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
   fi
 fi
 
-if [ "${SC_BOOT_MODE}" = "debug" ]; then
-  # NOTE: production does NOT pre-installs debugpy
-  uv pip install --no-cache-dir debugpy
-fi
-
 echo "$INFO Starting $* ..."
 echo "  $SC_USER_NAME rights    : $(id "$SC_USER_NAME")"
 echo "  local dir : $(ls -al)"
diff --git a/services/dynamic-sidecar/docker/boot.sh b/services/dynamic-sidecar/docker/boot.sh
@@ -31,6 +31,11 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
   pip list | sed 's/^/    /'
 fi
 
+if [ "${SC_BOOT_MODE}" = "debug" ]; then
+  # NOTE: production does NOT pre-installs debugpy
+  uv pip install --no-cache-dir debugpy
+fi
+
 #
 # RUNNING application
 #
diff --git a/services/dynamic-sidecar/docker/entrypoint.sh b/services/dynamic-sidecar/docker/entrypoint.sh
@@ -74,11 +74,6 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
   fi
 fi
 
-if [ "${SC_BOOT_MODE}" = "debug" ]; then
-  # NOTE: production does NOT pre-installs debugpy
-  uv pip install --no-cache-dir debugpy
-fi
-
 # Appends docker group if socket is mounted
 DOCKER_MOUNT=/var/run/docker.sock
 if stat $DOCKER_MOUNT >/dev/null 2>&1; then
diff --git a/services/efs-guardian/docker/boot.sh b/services/efs-guardian/docker/boot.sh
@@ -30,6 +30,11 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
   uv pip list
 fi
 
+if [ "${SC_BOOT_MODE}" = "debug" ]; then
+  # NOTE: production does NOT pre-installs debugpy
+  uv pip install --no-cache-dir debugpy
+fi
+
 #
 # RUNNING application
 #
diff --git a/services/invitations/docker/boot.sh b/services/invitations/docker/boot.sh
@@ -30,6 +30,11 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
   uv pip list
 fi
 
+if [ "${SC_BOOT_MODE}" = "debug" ]; then
+  # NOTE: production does NOT pre-installs debugpy
+  uv pip install --no-cache-dir debugpy
+fi
+
 #
 # RUNNING application
 #
diff --git a/services/invitations/docker/entrypoint.sh b/services/invitations/docker/entrypoint.sh
@@ -63,11 +63,6 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
   fi
 fi
 
-if [ "${SC_BOOT_MODE}" = "debug" ]; then
-  # NOTE: production does NOT pre-installs debugpy
-  uv pip install --no-cache-dir debugpy
-fi
-
 echo "$INFO Starting $* ..."
 echo "  $SC_USER_NAME rights    : $(id "$SC_USER_NAME")"
 echo "  local dir : $(ls -al)"
diff --git a/services/osparc-gateway-server/docker/boot.sh b/services/osparc-gateway-server/docker/boot.sh
@@ -25,15 +25,20 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
   pip list | sed 's/^/    /'
 fi
 
+if [ "${SC_BOOT_MODE}" = "debug" ]; then
+  # NOTE: production does NOT pre-installs debugpy
+  uv pip install --no-cache-dir debugpy
+fi
+
 if [ "${SC_BOOT_MODE}" = "debug" ]; then
   exec python -m debugpy --listen 0.0.0.0:"${OSPARC_GATEWAY_SERVER_DEBUGGING_PORT}" -m watchmedo auto-restart \
-      --recursive \
-      --pattern="*.py;*/src/*" \
-      --ignore-patterns="*test*;pytest_simcore/*;setup.py;*ignore*" \
-      --ignore-directories -- \
-      osparc-gateway-server \
-      --config "${GATEWAY_SERVER_CONFIG_FILE_CONTAINER}" \
-      --debug
+    --recursive \
+    --pattern="*.py;*/src/*" \
+    --ignore-patterns="*test*;pytest_simcore/*;setup.py;*ignore*" \
+    --ignore-directories -- \
+    osparc-gateway-server \
+    --config "${GATEWAY_SERVER_CONFIG_FILE_CONTAINER}" \
+    --debug
 else
   exec osparc-gateway-server \
     --config "${GATEWAY_SERVER_CONFIG_FILE_CONTAINER}"
diff --git a/services/osparc-gateway-server/docker/entrypoint.sh b/services/osparc-gateway-server/docker/entrypoint.sh
@@ -58,11 +58,6 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
   fi
 fi
 
-if [ "${SC_BOOT_MODE}" = "debug" ]; then
-  # NOTE: production does NOT pre-installs debugpy
-  uv pip install --no-cache-dir debugpy
-fi
-
 DOCKER_MOUNT=/var/run/docker.sock
 if stat $DOCKER_MOUNT >/dev/null 2>&1; then
   echo "$INFO detected docker socket is mounted, adding user to group..."
diff --git a/services/payments/docker/boot.sh b/services/payments/docker/boot.sh
@@ -30,6 +30,11 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
   uv pip list
 fi
 
+if [ "${SC_BOOT_MODE}" = "debug" ]; then
+  # NOTE: production does NOT pre-installs debugpy
+  uv pip install --no-cache-dir debugpy
+fi
+
 #
 # RUNNING application
 #
diff --git a/services/payments/docker/entrypoint.sh b/services/payments/docker/entrypoint.sh
@@ -63,11 +63,6 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
   fi
 fi
 
-if [ "${SC_BOOT_MODE}" = "debug" ]; then
-  # NOTE: production does NOT pre-installs debugpy
-  uv pip install --no-cache-dir debugpy
-fi
-
 echo "$INFO Starting $* ..."
 echo "  $SC_USER_NAME rights    : $(id "$SC_USER_NAME")"
 echo "  local dir : $(ls -al)"
diff --git a/services/resource-usage-tracker/docker/boot.sh b/services/resource-usage-tracker/docker/boot.sh
@@ -30,6 +30,11 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
   uv pip list
 fi
 
+if [ "${SC_BOOT_MODE}" = "debug" ]; then
+  # NOTE: production does NOT pre-installs debugpy
+  uv pip install --no-cache-dir debugpy
+fi
+
 #
 # RUNNING application
 #
diff --git a/services/resource-usage-tracker/docker/entrypoint.sh b/services/resource-usage-tracker/docker/entrypoint.sh
@@ -63,11 +63,6 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
   fi
 fi
 
-if [ "${SC_BOOT_MODE}" = "debug" ]; then
-  # NOTE: production does NOT pre-installs debugpy
-  uv pip install --no-cache-dir debugpy
-fi
-
 # Appends docker group if socket is mounted
 DOCKER_MOUNT=/var/run/docker.sock
 if stat $DOCKER_MOUNT >/dev/null 2>&1; then
diff --git a/services/storage/docker/boot.sh b/services/storage/docker/boot.sh
@@ -31,6 +31,11 @@ elif [ "${SC_BUILD_TARGET}" = "production" ]; then
   entrypoint=""
 fi
 
+if [ "${SC_BOOT_MODE}" = "debug" ]; then
+  # NOTE: production does NOT pre-installs debugpy
+  uv pip install --no-cache-dir debugpy
+fi
+
 APP_LOG_LEVEL=${STORAGE_LOGLEVEL:-${LOG_LEVEL:-${LOGLEVEL:-INFO}}}
 SERVER_LOG_LEVEL=$(echo "${APP_LOG_LEVEL}" | tr '[:upper:]' '[:lower:]')
 
diff --git a/services/storage/docker/entrypoint.sh b/services/storage/docker/entrypoint.sh
@@ -68,11 +68,6 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
   fi
 fi
 
-if [ "${SC_BOOT_MODE}" = "debug" ]; then
-  # NOTE: production does NOT pre-installs debugpy
-  uv pip install --no-cache-dir debugpy
-fi
-
 echo "$INFO Starting $* ..."
 echo "  $SC_USER_NAME rights    : $(id "$SC_USER_NAME")"
 echo "  local dir : $(ls -al)"
diff --git a/services/web/server/docker/boot.sh b/services/web/server/docker/boot.sh
@@ -29,6 +29,11 @@ elif [ "${SC_BUILD_TARGET}" = "production" ]; then
   APP_CONFIG=server-docker-prod.yaml
 fi
 
+if [ "${SC_BOOT_MODE}" = "debug" ]; then
+  # NOTE: production does NOT pre-installs debugpy
+  uv pip install --no-cache-dir debugpy
+fi
+
 APP_LOG_LEVEL=${WEBSERVER_LOGLEVEL:-${LOG_LEVEL:-${LOGLEVEL:-INFO}}}
 SERVER_LOG_LEVEL=$(echo "${APP_LOG_LEVEL}" | tr '[:upper:]' '[:lower:]')
 
diff --git a/services/web/server/docker/entrypoint.sh b/services/web/server/docker/entrypoint.sh
@@ -71,11 +71,6 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
   fi
 fi
 
-if [ "${SC_BOOT_MODE}" = "debug" ]; then
-  # NOTE: production does NOT pre-installs debugpy
-  uv pip install --no-cache-dir debugpy
-fi
-
 echo "$INFO Starting $* ..."
 echo "  $SC_USER_NAME rights    : $(id "$SC_USER_NAME")"
 echo "  local dir : $(ls -al)"

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,11 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then`
`30`	`30`	`uv pip list`
`31`	`31`	`fi`
`32`	`32`
	`33`	`+if [ "${SC_BOOT_MODE}" = "debug" ]; then`
	`34`	`+ # NOTE: production does NOT pre-installs debugpy`
	`35`	`+ uv pip install --no-cache-dir debugpy`
	`36`	`+fi`
	`37`	`+`
`33`	`38`	`#`
`34`	`39`	`# RUNNING application`
`35`	`40`	`#`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,11 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then`
`29`	`29`	`uv pip list`
`30`	`30`	`fi`
`31`	`31`
	`32`	`+if [ "${SC_BOOT_MODE}" = "debug" ]; then`
	`33`	`+ # NOTE: production does NOT pre-installs debugpy`
	`34`	`+ uv pip install --no-cache-dir debugpy`
	`35`	`+fi`
	`36`	`+`
`32`	`37`	`#`
`33`	`38`	`# RUNNING application`
`34`	`39`	`#`