Skip to content

Add custom --env-file support to simoc.py #378

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
ezio-melotti merged 1 commit into from
Jun 21, 2023
Merged

Add custom --env-file support to simoc.py #378

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 17 additions & 7 deletions simoc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,14 @@ def parse_env(fname):
print(f'Unrecognized line in {fname}: {line!r}')
return env

try:
ENVVARS = parse_env(ENV_FILE)
except FileNotFoundError:
sys.exit(f"Can't find env file: {ENV_FILE!r}")

# update environ with the new envvars
os.environ.update(ENVVARS)
def update_env(env_file):
try:
envvars = parse_env(env_file)
except FileNotFoundError:
sys.exit(f"Can't find env file: {env_file!r}")
# update environ with the new envvars
os.environ.update(envvars)
return envvars

COMMANDS = {}

Expand Down Expand Up @@ -388,6 +389,10 @@ def create_help(cmds):
'--docker-file', metavar='FILE', default=COMPOSE_FILE,
help='the docker-compose yml file (default: %(default)r)'
)
parser.add_argument(
'--env-file', metavar='FILE', default=ENV_FILE,
help='the env file (default: %(default)r)'
)
parser.add_argument(
'--with-dev-backend', action='store_true',
help='use the dev backend flask container'
Expand All @@ -408,6 +413,11 @@ def create_help(cmds):
if args.docker_file:
COMPOSE_FILE = args.docker_file
DOCKER_COMPOSE_CMD = ['docker-compose', '-f', COMPOSE_FILE]

if args.env_file:
ENV_FILE = args.env_file
ENVVARS = update_env(ENV_FILE)

if args.dev_backend_yml and not args.with_dev_backend:
parser.error("Can't specify the dev backend yml without --with-dev-backend")

Expand Down