restart the sandboxes if interrupted

(+ quote w/ shlex)

docker/controller.py

@@ -511,7 +511,7 @@ class SandboxManager(Manager):
                 # FIXME: do nothing if entrypoint already exists
                 command = ["/bin/sh", "-c", """
                     {mkdir}
-                    cat > {entrypoint!r} <<EOF
+                    test -f {entrypoint} || cat > {entrypoint} <<EOF
 #!/bin/sh
 echo
 echo "This is app '{name}' called with parameters '\$@'"
@@ -519,12 +519,12 @@ echo
 echo "The workdir contains:"
 ls -l
 EOF
-                    chmod 0755 -- {entrypoint!r}
+                    chmod 0755 -- {entrypoint}
                     exec {cmd}
-                """.format( entrypoint  = webapp.entrypoint,
+                """.format( entrypoint  = shlex.quote(webapp.entrypoint),
                             name        = webapp.docker_name,
-                            mkdir       = (("mkdir -p -- %r" % dn) if dn else ""),
-                            cmd         = " ".join(map(repr, command)))]
+                            mkdir       = (("mkdir -p -- %s" % shlex.quote(dn)) if dn else ""),
+                            cmd         = " ".join(map(shlex.quote, command)))]
 
             ctrl.sandbox.create_container(image, name=container, hostname=container,
                     command = command,
@@ -535,6 +535,7 @@ EOF
                             },
                         # TODO: maybe drop other caps
                         cap_drop = ["NET_RAW"],
+                        restart_policy = {"Name": "unless-stopped"},
                         ))
 
             ctrl.sandbox.start(container)