Skip to content

Remove env EC2_INSTANCES_ALLOWED_TYPES from special handling #914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 3, 2025
Merged

Remove env EC2_INSTANCES_ALLOWED_TYPES from special handling #914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a04bc41
Remove env EC2_INSTANCES_ALLOWED_TYPES from special handling
YuryHrytsuk Dec 17, 2024
c7d6d70
Merge branch 'main' into fix-prepare-env-for-simcore
YuryHrytsuk Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion scripts/deployments/compose_stack_yml.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
#
Expand Down
2 changes: 1 addition & 1 deletion services/simcore/envsubst_escape_dollar_sign.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
Loading