vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1391 from coreos-inc/rktbug

Browse source 
Better env handling
This commit is contained in:
josephschorr 2016-04-20 14:57:46 -04:00
commit ec35b3ba04
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
formats/aci.py
View file

@ -177,6 +177,17 @@ class ACIImage(TarImageFormatter):
hostname = app.config['SERVER_HOSTNAME'] hostname = app.config['SERVER_HOSTNAME']
hostname = hostname.split(':', 1)[0] hostname = hostname.split(':', 1)[0]
# Calculate the environment variables.
docker_env_vars = config.get('Env', [])
env_vars = []
for var in docker_env_vars:
pieces = var.split('=')
if len(pieces) != 2:
continue
env_vars.append(pieces)
manifest = { manifest = {
"acKind": "ImageManifest", "acKind": "ImageManifest",
"acVersion": "0.6.1", "acVersion": "0.6.1",
@ -202,8 +213,7 @@ class ACIImage(TarImageFormatter):
"group": config.get('Group', '') or 'root', "group": config.get('Group', '') or 'root',
"eventHandlers": [], "eventHandlers": [],
"workingDirectory": config.get('WorkingDir', '') or '/', "workingDirectory": config.get('WorkingDir', '') or '/',
"environment": [{"name": key, "value": value} "environment": [{"name": key, "value": value} for (key, value) in env_vars],
for (key, value) in [e.split('=') for e in config.get('Env', []) or []]],
"isolators": ACIImage._build_isolators(config), "isolators": ACIImage._build_isolators(config),
"mountPoints": ACIImage._build_volumes(config), "mountPoints": ACIImage._build_volumes(config),
"ports": ACIImage._build_ports(config), "ports": ACIImage._build_ports(config),