tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-13 16:54:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4034 from realab/fix-restart-with-null-string

Browse Source 
fix serialize restart spec with null string
This commit is contained in:
Joffrey F 2016-10-14 14:34:35 -07:00 committed by GitHub
commit 50faddb683
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compose/config/types.py
View File

@ -93,6 +93,8 @@ def parse_restart_spec(restart_config):
def serialize_restart_spec(restart_spec): def serialize_restart_spec(restart_spec):
if not restart_spec:
return ''
parts = [restart_spec['Name']] parts = [restart_spec['Name']]
if restart_spec['MaximumRetryCount']: if restart_spec['MaximumRetryCount']:
parts.append(six.text_type(restart_spec['MaximumRetryCount'])) parts.append(six.text_type(restart_spec['MaximumRetryCount']))

4
tests/acceptance/cli_test.py
View File

@ -236,6 +236,10 @@ class CLITestCase(DockerClientTestCase):
'image': 'busybox', 'image': 'busybox',
'restart': 'on-failure:5', 'restart': 'on-failure:5',
}, },
'restart-null': {
'image': 'busybox',
'restart': ''
},
}, },
'networks': {}, 'networks': {},
'volumes': {}, 'volumes': {},

3
tests/fixtures/restart/docker-compose.yml vendored
View File

@ -12,3 +12,6 @@ services:
on-failure-5: on-failure-5:
image: busybox image: busybox
restart: "on-failure:5" restart: "on-failure:5"
restart-null:
image: busybox
restart: ""