Merge "Revert "docker/compose: quote health-cmd""

openstack-archive · Jun 17, 2019 · 01eb542 · 01eb542
2 parents 87ab8dc + a809d78
commit 01eb542
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/paunch/builder/compose1.py b/paunch/builder/compose1.py
@@ -44,7 +44,7 @@ def container_run_args(self, cmd, container):
         if 'healthcheck' in cconfig:
             hconfig = cconfig['healthcheck']
             if 'test' in hconfig:
-                cmd.append('--health-cmd="%s"' % hconfig['test'])
+                cmd.append('--health-cmd=%s' % hconfig['test'])
             if 'interval' in hconfig:
                 cmd.append('--health-interval=%s' % hconfig['interval'])
             if 'timeout' in hconfig:

diff --git a/paunch/tests/test_builder_compose1.py b/paunch/tests/test_builder_compose1.py
@@ -29,7 +29,7 @@ def test_cont_run_args(self):
                 'uts': 'host',
                 'restart': 'always',
                 'healthcheck': {
-                    'test': 'ls /mydir',
+                    'test': '/bin/true',
                     'interval': '30s',
                     'timeout': '10s',
                     'retries': 3
@@ -59,7 +59,7 @@ def test_cont_run_args(self):
             ['docker', 'run', '--name', 'one',
              '--detach=true', '--env-file=/tmp/foo.env',
              '--net=host', '--ipc=host', '--pid=container:bar',
-             '--uts=host', '--health-cmd="ls /mydir"', '--health-interval=30s',
+             '--uts=host', '--health-cmd=/bin/true', '--health-interval=30s',
              '--health-timeout=10s', '--health-retries=3',
              '--privileged=true', '--restart=always', '--user=bar',
              '--log-opt=tag={{.ImageName}}/{{.Name}}/{{.ID}}',