Change test 610 to use a Weaveworks container
Previously we used 'alpine' which had no 'CMD' line, but that changed upstream, so generate our own trivial image for this purpose.
This commit is contained in:
1 parent
3fdca717c1
commit
afac7c4d09
2 files changed
+5
-1
No files matched your search
@@ -46,6 +46,6 @@ assert "echo $((dirs_with_proxy-3))" $dirs_sans_proxy
|
||||
# Check errors are returned (when docker returns an error code)
|
||||
assert_raises "proxy docker_on $HOST1 run -e 'WEAVE_CIDR=10.2.1.3/24' $SMALL_IMAGE foo 2>&1 | grep 'exec: \"foo\": executable file not found in \$PATH'"
|
||||
# Check errors still happen when no command is specified
|
||||
assert_raises "proxy docker_on $HOST1 run -e 'WEAVE_CIDR=10.2.1.3/24' $SMALL_IMAGE 2>&1 | grep 'Error response from daemon: No command specified'"
|
||||
assert_raises "proxy docker_on $HOST1 run -e 'WEAVE_CIDR=10.2.1.3/24' weaveworks/no-cmd 2>&1 | grep 'Error response from daemon: No command specified'"
|
||||
|
||||
end_suite
|
||||
@@ -0,0 +1,4 @@
|
||||
# Create a Docker image with no CMD, specifically so we can generate
|
||||
# an error when we try to run it
|
||||
FROM scratch
|
||||
COPY Dockerfile /
|
||||
Reference in new issue
Block a user