diff options
| author | Stefan Becker <chemobejk@gmail.com> | 2019-07-13 18:22:41 +0300 |
|---|---|---|
| committer | Stefan Becker <chemobejk@gmail.com> | 2019-07-14 10:33:01 +0300 |
| commit | e4cba7d36a49353febfefcb25d2d820bc89e9d1b (patch) | |
| tree | da0d158215568fba288cd1db6a059c57c82c5fc9 /test/e2e/common_test.go | |
| parent | c59d08bc77855c0d0d946fa44850a0bf03b102c9 (diff) | |
| download | podman-e4cba7d36a49353febfefcb25d2d820bc89e9d1b.tar.gz podman-e4cba7d36a49353febfefcb25d2d820bc89e9d1b.tar.bz2 podman-e4cba7d36a49353febfefcb25d2d820bc89e9d1b.zip | |
create: improve parser for --healthcheck-command
Fix Docker CLI compatibility issue: the "--healthcheck-command" option
value should not be split but instead be passed as single string to
"CMD-SHELL", i.e. "/bin/sh -c <opt>".
On the other hand implement the same extension as is already available
for "--entrypoint", i.e. allow the option value to be a JSON array of
strings. This will make life easier for tools like podman-compose.
Updated "--healthcheck-command" option values in tests accordingly.
Continuation of #3455 & #3507
Signed-off-by: Stefan Becker <chemobejk@gmail.com>
Diffstat (limited to 'test/e2e/common_test.go')
| -rw-r--r-- | test/e2e/common_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index 21afc4b84..b233a772a 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -375,7 +375,7 @@ func (p *PodmanTestIntegration) RunNginxWithHealthCheck(name string) (*PodmanSes if name != "" { podmanArgs = append(podmanArgs, "--name", name) } - podmanArgs = append(podmanArgs, "-dt", "-P", "--healthcheck-command", "CMD-SHELL curl http://localhost/", nginx) + podmanArgs = append(podmanArgs, "-dt", "-P", "--healthcheck-command", "curl http://localhost/", nginx) session := p.Podman(podmanArgs) session.WaitWithDefaultTimeout() return session, session.OutputToString() |