jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup requirements.txt so we don't have to maintain separate copies for py2 and py3.

Browse source 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
This commit is contained in:
Daniel Nephin 2015-07-02 22:35:20 -04:00
commit 2943ac6812
15 changed files with 44 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compose/service.py
View file

@ -709,7 +709,9 @@ class Service(object):
def build(self, no_cache=False):
log.info('Building %s...' % self.name)
path = six.binary_type(self.options['build'])
path = self.options['build']
if not six.PY3:
path = path.encode('utf8')
build_output = self.client.build(
path=path,
@ -840,7 +842,7 @@ def merge_volume_bindings(volumes_option, previous_container):
volume_bindings.update(
get_container_data_volumes(previous_container, volumes_option))
return volume_bindings.values()
return list(volume_bindings.values())
def get_container_data_volumes(container, volumes_option):
@ -853,7 +855,7 @@ def get_container_data_volumes(container, volumes_option):
container_volumes = container.get('Volumes') or {}
image_volumes = container.image_config['ContainerConfig'].get('Volumes') or {}
for volume in set(volumes_option + image_volumes.keys()):
for volume in set(volumes_option + list(image_volumes)):
volume = parse_volume_spec(volume)
# No need to preserve host volumes
if volume.external: