tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-27 15:44:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't call create on existing volumes

Browse Source 
Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2016-03-02 15:15:50 -08:00
parent 9e242cdc75
commit 698998c410
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
compose/volume.py
View File

@ -3,7 +3,6 @@ from __future__ import unicode_literals
import logging import logging
from docker.errors import APIError
from docker.errors import NotFound from docker.errors import NotFound
from .config import ConfigurationError from .config import ConfigurationError
@ -82,12 +81,13 @@ class ProjectVolumes(object):
def initialize(self): def initialize(self):
try: try:
for volume in self.volumes.values(): for volume in self.volumes.values():
volume_exists = volume.exists()
if volume.external: if volume.external:
log.debug( log.debug(
'Volume {0} declared as external. No new ' 'Volume {0} declared as external. No new '
'volume will be created.'.format(volume.name) 'volume will be created.'.format(volume.name)
) )
if not volume.exists(): if not volume_exists:
raise ConfigurationError( raise ConfigurationError(
'Volume {name} declared as external, but could' 'Volume {name} declared as external, but could'
' not be found. Please create the volume manually' ' not be found. Please create the volume manually'
@ -97,28 +97,32 @@ class ProjectVolumes(object):
) )
) )
continue continue
if not volume_exists:
log.info( log.info(
'Creating volume "{0}" with {1} driver'.format( 'Creating volume "{0}" with {1} driver'.format(
volume.full_name, volume.driver or 'default' volume.full_name, volume.driver or 'default'
) )
) )
volume.create() volume.create()
except NotFound: else:
driver = volume.inspect()['Driver']
if driver != volume.driver:
raise ConfigurationError( raise ConfigurationError(
'Volume %s specifies nonexistent driver %s' % (volume.name, volume.driver) 'Configuration for volume {0} specifies driver '
) '{1}, but a volume with the same name uses a '
except APIError as e: 'different driver ({3}). If you wish to use the '
if 'Choose a different volume name' in str(e): 'new configuration, please remove the existing '
raise ConfigurationError( 'volume "{2}" first:\n'
'Configuration for volume {0} specifies driver {1}, but '
'a volume with the same name uses a different driver '
'({3}). If you wish to use the new configuration, please '
'remove the existing volume "{2}" first:\n'
'$ docker volume rm {2}'.format( '$ docker volume rm {2}'.format(
volume.name, volume.driver, volume.full_name, volume.name, volume.driver, volume.full_name,
volume.inspect()['Driver'] volume.inspect()['Driver']
) )
) )
except NotFound:
raise ConfigurationError(
'Volume %s specifies nonexistent driver %s' % (volume.name, volume.driver)
)
def namespace_spec(self, volume_spec): def namespace_spec(self, volume_spec):
if not volume_spec.is_named_volume: if not volume_spec.is_named_volume: