Skip to content
Closed
Changes from all commits
Commits
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
19 changes: 17 additions & 2 deletions fig/cli/command.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from __future__ import absolute_import
from docker import Client
from requests.exceptions import ConnectionError
from urlparse import urlparse
import errno
import logging
import os
Expand Down Expand Up @@ -68,12 +69,26 @@ def get_config(self, config_path):
raise errors.FigFileNotFound(os.path.basename(e.filename))
raise errors.UserError(six.text_type(e))

def expand_env_vars(self, config, base_url):
def expand(env):
for k, v in env.iteritems():
url = urlparse(base_url)
if isinstance(v, basestring):
env[k] = v.replace('$DOCKER_HOST_IP', url.hostname)
return env
for k, v in config.iteritems():
if 'environment' in config[k]:
config[k]['environment'] = expand(config[k]['environment'])
return config

def get_project(self, config_path, project_name=None, verbose=False):
config = self.get_config(config_path)
client = self.get_client(verbose=verbose)
try:
return Project.from_config(
self.get_project_name(config_path, project_name),
self.get_config(config_path),
self.get_client(verbose=verbose))
self.expand_env_vars(config, client.base_url),
client)
except ConfigError as e:
raise errors.UserError(six.text_type(e))

Expand Down