From 6f90f13b2c2ed9641f7a5974704c276fbeb1e514 Mon Sep 17 00:00:00 2001 From: Yury Hrytsuk <50014626+YuryHrytsuk@users.noreply.github.com> Date: Fri, 3 Jan 2025 09:45:27 +0100 Subject: [PATCH] Remove env EC2_INSTANCES_ALLOWED_TYPES from special handling (#914) --- scripts/deployments/compose_stack_yml.bash | 1 - services/simcore/envsubst_escape_dollar_sign.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/deployments/compose_stack_yml.bash b/scripts/deployments/compose_stack_yml.bash index ac2bcff3..6d7788e6 100755 --- 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 index edea12a4..9083be36 100644 --- 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}"