| |
@@ -96,9 +96,7 @@
|
| |
# And launch the actual container
|
| |
cmd = [
|
| |
"/usr/bin/docker", "run", "--detach", "--cidfile={0}".format(cidfile),
|
| |
- ] + extra_arg_list + [
|
| |
- "--entrypoint=/bin/sh", image, "-c", "sleep 1000000"
|
| |
- ]
|
| |
+ ] + extra_arg_list + [image, "-c", "sleep 1000000"]
|
| |
try:
|
| |
subprocess.check_call(cmd, stdout=sys.stderr.fileno())
|
| |
except subprocess.CalledProcessError:
|
| |
Do not hardcode an entry point because images with systemd need
/usr/sbin/init
as entry point and not/bin/sh
. Container images canspecify the entry point in the container specification (Dockerfile). If
it is necessary to specify it on the command line, users can use
TEST_DOCKER_EXTRA_ARGS
to set an entry point.This fixes #330