Remove env EC2_INSTANCES_ALLOWED_TYPES from special handling (#914)

YuryHrytsuk · web-flow · commit 6f90f13b2c2e · 2025-01-03T08:45:27.000Z
diff --git a/scripts/deployments/compose_stack_yml.bash b/scripts/deployments/compose_stack_yml.bash
@@ -80,7 +80,6 @@ envsubst < .env.nosub > .env
 cp .env ..
 cp ../../docker-compose.yml ./docker-compose.simcore.yml
 
-unset EC2_INSTANCES_ALLOWED_TYPES
 "$repo_basedir"/scripts/docker-stack-config.bash -e .env docker-compose.simcore.yml docker-compose.deploy.yml > ../../stack.yml
 #
 #
diff --git a/services/simcore/envsubst_escape_dollar_sign.py b/services/simcore/envsubst_escape_dollar_sign.py
@@ -12,7 +12,7 @@
     for line in lines:
         if len(line) > 0 and len(line.lstrip()) > 0:
             if line.lstrip()[0] != "#":  # Ignore commented lines
-                if "$" in line and not line.startswith("EC2_INSTANCES_ALLOWED_TYPES"):
+                if "$" in line:
                     ESCAPED_LINE = "".join(
                         [
                             x + "$${empty_var}"

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,6 @@ envsubst < .env.nosub > .env`
`80`	`80`	`cp .env ..`
`81`	`81`	`cp ../../docker-compose.yml ./docker-compose.simcore.yml`
`82`	`82`
`83`		`-unset EC2_INSTANCES_ALLOWED_TYPES`
`84`	`83`	`"$repo_basedir"/scripts/docker-stack-config.bash -e .env docker-compose.simcore.yml docker-compose.deploy.yml > ../../stack.yml`
`85`	`84`	`#`
`86`	`85`	`#`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`for line in lines:`
`13`	`13`	`if len(line) > 0 and len(line.lstrip()) > 0:`
`14`	`14`	`if line.lstrip()[0] != "#": # Ignore commented lines`
`15`		`- if "$" in line and not line.startswith("EC2_INSTANCES_ALLOWED_TYPES"):`
	`15`	`+ if "$" in line:`
`16`	`16`	`ESCAPED_LINE = "".join(`
`17`	`17`	`[`
`18`	`18`	`x + "$${empty_var}"`