Merge remote-tracking branch 'upstream/main'

mrnicegyu11 · mrnicegyu11 · commit f6f4f3632f7e · 2025-02-25T07:51:20.000+01:00
diff --git a/scripts/deployments/validate_simcore_stack_yml.bash b/scripts/deployments/validate_simcore_stack_yml.bash
@@ -79,6 +79,9 @@ for service in $($_yq e '.services | keys | .[]' ${COMPOSE_FILE}); do
     if [ "${TARGETNAME}" == "efs-guardian" ]; then
         continue
     fi
+    if [ "${TARGETNAME}" == "docker-api-proxy" ]; then
+        continue
+    fi
     export TARGET_BINARY="simcore-service"
     echo "Assuming TARGET_BINARY in ${SETTINGS_BINARY_PATH}/${TARGET_BINARY}"
     # Pull image from registry, just in case
diff --git a/services/admin-panels/docker-compose.aws.yml b/services/admin-panels/docker-compose.aws.yml
@@ -2,4 +2,4 @@ version: '3.7'
 services:
   adminpanels:
     dns: # Add this always for AWS, otherwise we get "No such image: " for docker services
-      8.8.8.8
+      9.9.9.9
diff --git a/services/adminer/docker-compose.aws.yml b/services/adminer/docker-compose.aws.yml
@@ -2,7 +2,7 @@ version: '3.7'
 services:
   adminer:
     dns: # Add this always for AWS, otherwise we get "No such image: " for docker services
-      8.8.8.8
+      9.9.9.9
     deploy:
       placement:
         constraints:
diff --git a/services/appmotion_gateway/docker-compose.aws.yml b/services/appmotion_gateway/docker-compose.aws.yml
@@ -6,12 +6,12 @@ services:
         deploy:
             replicas: 1
         dns: # Add this always for AWS, otherwise we get "No such image: " for docker services
-          8.8.8.8
+          9.9.9.9
     db:
         deploy:
             replicas: 0
         dns: # Add this always for AWS, otherwise we get "No such image: " for docker services
-          8.8.8.8
+          9.9.9.9
 
     api:
         deploy:
@@ -20,4 +20,4 @@ services:
                     cpus: "0"  # nih staging has not enough cpu
             replicas: 1
         dns: # Add this always for AWS, otherwise we get "No such image: " for docker services
-          8.8.8.8
+          9.9.9.9
diff --git a/services/filestash/docker-compose.aws.yml b/services/filestash/docker-compose.aws.yml
@@ -2,4 +2,4 @@ version: '3.7'
 services:
   filestash:
     dns: # Add this always for AWS, otherwise we get "No such image: " for docker services
-      8.8.8.8
+      9.9.9.9
diff --git a/services/graylog/docker-compose.aws.yml b/services/graylog/docker-compose.aws.yml
@@ -12,7 +12,7 @@ services:
           - node.labels.graylog==true
   graylog:
     dns: # Add this always for AWS, otherwise we get "No such image: " for docker services
-      8.8.8.8
+      9.9.9.9
     deploy:
       placement:
         constraints:
diff --git a/services/jaeger/docker-compose.aws.yml b/services/jaeger/docker-compose.aws.yml
@@ -2,4 +2,4 @@ version: '3.7'
 services:
   jaeger:
     dns: # Add this always for AWS, otherwise we get "No such image: " for docker services
-      8.8.8.8
+      9.9.9.9
diff --git a/services/monitoring/docker-compose.aws.yml b/services/monitoring/docker-compose.aws.yml
@@ -9,7 +9,7 @@ services:
       - /dev/disk/:/dev/disk:ro
 
   prometheuscatchall:
-    dns: 8.8.8.8
+    dns: 9.9.9.9
     deploy:
       placement:
         constraints:
@@ -18,13 +18,13 @@ services:
         limits:
           memory: 24576M
   prometheusfederation:
-    dns: 8.8.8.8
+    dns: 9.9.9.9
     deploy:
       placement:
         constraints:
           - node.labels.prometheus==true
   grafana:
-    dns: 8.8.8.8
+    dns: 9.9.9.9
     deploy:
       placement:
         constraints:
diff --git a/services/monitoring/docker-compose.dalco.yml b/services/monitoring/docker-compose.dalco.yml
@@ -10,7 +10,7 @@ services:
       - /dev/disk/:/dev/disk:ro
 
   grafana:
-    dns: 8.8.8.8
+    dns: 9.9.9.9
     deploy:
       placement:
         constraints:
diff --git a/services/monitoring/docker-compose.public.yml b/services/monitoring/docker-compose.public.yml
@@ -9,7 +9,7 @@ services:
       - /dev/disk/:/dev/disk:ro
 
   grafana:
-    dns: 8.8.8.8
+    dns: 9.9.9.9
     deploy:
       placement:
         constraints:
diff --git a/services/portainer/docker-compose.aws.yml b/services/portainer/docker-compose.aws.yml
@@ -2,7 +2,7 @@ version: '3.7'
 services:
   portainer:
     dns: # Add this always for AWS, otherwise we get "No such image: " for docker services
-      8.8.8.8
+      9.9.9.9
     deploy:
       placement:
         constraints:
diff --git a/services/registry/docker-compose.aws.yml b/services/registry/docker-compose.aws.yml
@@ -2,4 +2,4 @@ version: '3.7'
 services:
   registry:
     dns: # Add this always for AWS, otherwise we get "No such image: " for docker services
-      8.8.8.8
+      9.9.9.9
diff --git a/services/simcore/docker-compose.deploy.master.yml b/services/simcore/docker-compose.deploy.master.yml
@@ -68,7 +68,8 @@ services:
   clusters-keeper:
     deploy:
       replicas: 0
-  payments:  # test prior to a big bang release Sept 2023. Can be deleted after (YH, 09 2023)
+  payments:
+    # test prior to a big bang release Sept 2023. Can be deleted after (YH, 09 2023)
     deploy:
       replicas: 1
 
@@ -82,4 +83,4 @@ services:
 
   storage:
     deploy:
-      replicas: 3
+      replicas: 1
diff --git a/services/traefik/docker-compose.aws.yml b/services/traefik/docker-compose.aws.yml
@@ -49,7 +49,7 @@ services:
         target: /etc/traefik/dynamic_conf.yml
   whoami:
     dns: # Add this always for AWS, otherwise we get "No such image: " for docker services
-      8.8.8.8
+      9.9.9.9
 
 configs:
   traefik_dynamic_config.yml:
diff --git a/services/traefik/docker-compose.public.yml b/services/traefik/docker-compose.public.yml
@@ -1,7 +1,7 @@
 version: "3.7"
 services:
   traefik:
-    dns: 8.8.8.8 # This is critical to make the ACME challange work
+    dns: 9.9.9.9 # This is critical to make the ACME challange work
     command:
       - "--api=true"
       - "--api.dashboard=true"
