Merge branch 'main' into add/validate_simcore_stack.bash

ITISFoundation · Nov 17, 2023 · d199b02 · d199b02
2 parents 20d9e44 + eb8968e
commit d199b02
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 28 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,9 @@
+## What do these changes do?
+
+## Related issue/s
+
+## Related PR/s
+
+## Checklist
+
+- [ ] I tested and it works
diff --git a/services/simcore/docker-compose.yml b/services/simcore/docker-compose.yml
@@ -29,34 +29,6 @@ services:
           - node.labels.simcore==true
 
   autoscaling:
-    environment:
-      - EC2_ACCESS_KEY_ID=${AUTOSCALING_EC2_ACCESS_KEY_ID} # defines the access key to EC2
-      - EC2_SECRET_ACCESS_KEY=${AUTOSCALING_EC2_SECRET_ACCESS_KEY} # defines the secret key to EC2
-      - EC2_REGION_NAME=${AUTOSCALING_EC2_REGION_NAME}
-      - EC2_INSTANCES_ALLOWED_TYPES=${AUTOSCALING_EC2_INSTANCES_ALLOWED_TYPES} # defines the allowed EC2 instance types (["t2.nano", ...])
-      - EC2_INSTANCES_AMI_ID=${AUTOSCALING_EC2_INSTANCES_AMI_ID} # defines the AMI ID to use
-      - EC2_INSTANCES_CUSTOM_BOOT_SCRIPTS=${AUTOSCALING_EC2_INSTANCES_CUSTOM_BOOT_SCRIPTS}
-      - EC2_INSTANCES_MACHINES_BUFFER=${AUTOSCALING_EC2_INSTANCES_MACHINES_BUFFER} # defines the number of reserved machines
-      - EC2_INSTANCES_MAX_INSTANCES=${AUTOSCALING_EC2_INSTANCES_MAX_INSTANCES} # maximum number of instances
-      - EC2_INSTANCES_PRE_PULL_IMAGES=${AUTOSCALING_EC2_INSTANCES_PRE_PULL_IMAGES}
-      - EC2_INSTANCES_SECURITY_GROUP_IDS=${AUTOSCALING_EC2_INSTANCES_SECURITY_GROUP_IDS} # defines the security groups for starting EC2s
-      - EC2_INSTANCES_SUBNET_ID=${AUTOSCALING_EC2_INSTANCES_SUBNET_ID} # defines the subnet ID to use for the EC2 instances
-      - EC2_INSTANCES_KEY_NAME=${AUTOSCALING_EC2_INSTANCES_KEY_NAME} # defines the used Key name for the EC2 instances
-      - NODES_MONITORING_NODE_LABELS=${AUTOSCALING_NODES_MONITORING_NODE_LABELS} # defines the labels to check for on the nodes (i.e. ["dynamicsidecar"])
-      - NODES_MONITORING_SERVICE_LABELS=${AUTOSCALING_NODES_MONITORING_SERVICE_LABELS} # optional defines the label to check for on the monitored services
-      - NODES_MONITORING_NEW_NODES_LABELS=${NODES_MONITORING_NEW_NODES_LABELS} # optional defines the name of the monitored service
-      - RABBIT_HOST=${RABBIT_HOST}
-      - RABBIT_PASSWORD=${RABBIT_PASSWORD}
-      - RABBIT_PORT=${RABBIT_PORT}
-      - RABBIT_SECURE=${RABBIT_SECURE}
-      - RABBIT_USER=${RABBIT_USER}
-      - REDIS_HOST=${REDIS_HOST}
-      - REDIS_PORT=${REDIS_PORT}
-      - REGISTRY_USER=${REGISTRY_USER}
-      - REGISTRY_PW=${REGISTRY_PW}
-      - REGISTRY_URL=${REGISTRY_URL}
-      - REGISTRY_SSL=${REGISTRY_SSL}
-      - REGISTRY_AUTH=${REGISTRY_AUTH}
     deploy:
       update_config:
         parallelism: 2