diff --git a/swarm/docker/Dockerfile b/swarm/docker/Dockerfile
index b4c234881a..003bbc0a1d 100644
--- a/swarm/docker/Dockerfile
+++ b/swarm/docker/Dockerfile
@@ -16,4 +16,5 @@ FROM alpine:3.8
 WORKDIR /
 COPY --from=builder /swarm /geth /swarm-smoke /
 ADD run.sh /run.sh
+ADD run-smoke.sh /run-smoke.sh
 ENTRYPOINT ["/run.sh"]
diff --git a/swarm/docker/run-smoke.sh b/swarm/docker/run-smoke.sh
new file mode 100755
index 0000000000..ba57a7ecd6
--- /dev/null
+++ b/swarm/docker/run-smoke.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -o errexit
+set -o pipefail
+set -o nounset
+
+/swarm-smoke $@ 2>&1 || true