Hopiu/portainer-cli
1
0
Fork 0
mirror of https://github.com/Hopiu/portainer-cli.git synced 2026-05-21 13:01:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Environement variable can both comme from file and parameters

Browse source
This commit is contained in:
VALLEY Antoine (T0173847) 2019-07-24 09:44:03 +02:00
parent bec593bf40
commit 083e0e95f0
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
portainer_cli/__init__.py
View file

@ -250,8 +250,17 @@ class PortainerCLI(object):
return stack['Id'] return stack['Id']
def extract_env(self, env_file='', *args): def extract_env(self, env_file='', *args):
# Handle --env.PARAM=VALUE
env_args = filter(
lambda x: re.match(env_arg_regex, x),
args,
)
env = dict(map(
lambda x: env_arg_to_dict(x),
env_args,
))
# Hand environement file
if env_file: if env_file:
env = {}
for env_line in open(env_file).readlines(): for env_line in open(env_file).readlines():
env_line = env_line.strip() env_line = env_line.strip()
if not env_line or env_line.startswith('#') or '=' not in env_line: if not env_line or env_line.startswith('#') or '=' not in env_line:
@ -259,15 +268,7 @@ class PortainerCLI(object):
k, v = env_line.split('=', 1) k, v = env_line.split('=', 1)
k, v = k.strip(), v.strip() k, v = k.strip(), v.strip()
env[k] = v env[k] = v
else:
env_args = filter(
lambda x: re.match(env_arg_regex, x),
args,
)
env = dict(map(
lambda x: env_arg_to_dict(x),
env_args,
))
return env return env
@plac.annotations( @plac.annotations(