Fixes and improvemens for osparc.local

Author: mrnicegyu11

scripts/deployments/start_simcore_locally.bash

@@ -72,7 +72,7 @@ if [[ "$devel_repo_path" = "0" ]] ; then
     #       IF GETREPO DOESNT EXIST
     if [ ! -d osparc-simcore ]; then
         export GIT_SIMCORE_REPO_URL="https://github.com/ITISFoundation/osparc-simcore.git"
-        git clone "$GIT_SIMCORE_REPO_URL"
+        git clone --depth 1 "$GIT_SIMCORE_REPO_URL"
     fi
     #       FI
     #

services/monitoring/docker-compose.yml.j2

@@ -408,6 +408,9 @@ configs:
   prometheus_config_federation:
     name: ${STACK_NAME}_prometheus_config_federation_{{ "./prometheus/prometheus-federation.yml" | sha256file | substring(0,10) }}
     file: ./prometheus/prometheus-federation.yml
+  prometheus_config:
+    name: ${STACK_NAME}_prometheus_config_{{ "./prometheus/prometheus.yml" | sha256file | substring(0,10) }}
+    file: ./prometheus/prometheus.yml
   prometheus_rules:
     name: ${STACK_NAME}_prometheus_rules_{{ "./prometheus/prometheus.rules.yml" | sha256file | substring(0,10) }}
     file: ./prometheus/prometheus.rules.yml

services/simcore/docker-compose.deploy.local.yml

@@ -9,6 +9,18 @@ services:
   catalog:
     deploy:
       replicas: ${SIMCORE_CATALOG_REPLICAS}
+  sto-worker-cpu-bound:
+    secrets:
+        - source: storageca.crt
+          target: /usr/local/share/ca-certificates/osparc.crt
+    environment:
+      - REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
+  sto-worker:
+    secrets:
+        - source: storageca.crt
+          target: /usr/local/share/ca-certificates/osparc.crt
+    environment:
+      - REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
   storage:
     secrets:
         - source: storageca.crt
@@ -113,6 +125,8 @@ services:
   webserver:
     deploy:
       replicas: 1
+    healthcheck:
+      test: ["CMD", "echo", "health"]
     secrets:
       - source: rootca.crt
         target: /usr/local/share/ca-certificates/osparc.crt

services/traefik/Makefile

@@ -42,7 +42,7 @@ traefik_dynamic_config.yml:
 
 
 .PHONY: ${TEMP_COMPOSE}-local
-${TEMP_COMPOSE}-local: docker-compose.yml docker-compose.local.yml .env
+${TEMP_COMPOSE}-local: docker-compose.yml docker-compose.local.yml .env traefik_dynamic_config.yml
 	@set -o allexport; \
 	source .env; \
 	set +o allexport; \

services/traefik/config/customCAInit.sh

@@ -4,7 +4,8 @@
 # If necessary.
 #
 #Uncomment this to debug:
-#echo Remaining arguments passed to Traefik: "$@"
+echo Running custom entrypointsh to add self-signed CAs
+echo Remaining arguments passed to Traefik: "$@"
 #
 # Add cp statements for the certificates here:
 cp /secrets/storageca.crt /usr/local/share/ca-certificates

services/traefik/docker-compose.local.yml

@@ -63,8 +63,10 @@ services:
       - source: customEntrypoint.sh
         target: /customEntrypoint.sh
     secrets:
-      - domain.key
-      - domain.crt
+      - source: domain.key
+        target: /etc/traefik_certs/osparc.local.key
+      - source: domain.crt
+        target: /etc/traefik_certs/osparc.local.crt
       - source: storageca.crt
         target: /secrets/storageca.crt