pomeo · September 24, 2024 09:32 · Sep 24, 2024 · May 16, 2023 · May 16, 2023 · Feb 10, 2023
diff --git a/run.tpl b/run.tpl
@@ -1,4 +1,4 @@
-docker run \
+sudo docker run \
   --name {{printf "%q" .Name}} \
     {{- with .HostConfig}}
         {{- if .Privileged}}

diff --git a/run.tpl b/run.tpl
@@ -104,6 +104,9 @@ docker run \
         {{- range $p, $conf := .ExposedPorts}}
   --expose {{printf "%q" $p}} \
         {{- end}}
+        {{- end}}
+        {{- if .User}}
+  --user {{printf "%q" .User}} \
         {{- end}}
         {{- range $e := .Env}}
   --env {{printf "%q" $e}} \

diff --git a/run.tpl b/run.tpl
@@ -19,9 +19,30 @@ docker run \
         {{- range $l := .Links}}
   --link {{printf "%q" $l}} \
         {{- end}}
-        {{- if .Mounts}}
-            {{- range .Mounts}}
-  --mount type={{.Type}},source={{.Source}},destination={{.Target}}{{- if .BindOptions}},bind-propagation={{.BindOptions.Propagation}}{{- end}}{{- if .ReadOnly}},readonly{{- end}} \
+        {{- if index . "Mounts"}}
+            {{- range $m := .Mounts}}
+  --mount type={{.Type}}
+                {{- if $s := index $m "Source"}},source={{$s}}{{- end}}
+                {{- if $t := index $m "Target"}},destination={{$t}}{{- end}}
+                {{- if index $m "ReadOnly"}},readonly{{- end}}
+                {{- if $vo := index $m "VolumeOptions"}}
+                    {{- range $i, $v := $vo.Labels}}
+                        {{- printf ",volume-label=%s=%s" $i $v}}
+                    {{- end}}
+                    {{- if $dc := index $vo "DriverConfig" }}
+                        {{- if $n := index $dc "Name" }}
+                            {{- printf ",volume-driver=%s" $n}}
+                        {{- end}}
+                        {{- range $i, $v := $dc.Options}}
+                            {{- printf ",volume-opt=%s=%s" $i $v}}
+                        {{- end}}
+                    {{- end}}
+                {{- end}}
+                {{- if $bo := index $m "BindOptions"}}
+                    {{- if $p := index $bo "Propagation" }}
+                        {{- printf ",bind-propagation=%s" $p}}
+                    {{- end}}
+                {{- end}} \
             {{- end}}
         {{- end}}
         {{- if .PublishAllPorts}}
@@ -79,8 +100,10 @@ docker run \
         {{- if .Domainname}}
   --domainname {{printf "%q" .Domainname}} \
         {{- end}}
+        {{- if index . "ExposedPorts"}}
         {{- range $p, $conf := .ExposedPorts}}
   --expose {{printf "%q" $p}} \
+        {{- end}}
         {{- end}}
         {{- range $e := .Env}}
   --env {{printf "%q" $e}} \

diff --git a/run.tpl b/run.tpl
@@ -15,13 +15,15 @@ docker run \
         {{- end}}
         {{- range $v := .VolumesFrom}}
   --volumes-from {{printf "%q" $v}} \
-        {{- end}}
-        {{- range .Mounts}}
-  --mount type={{.Type}},source={{.Source}},destination={{.Target}}{{- if .BindOptions}},bind-propagation={{.BindOptions.Propagation}}{{- end}}{{- if .ReadOnly}},readonly{{- end}} \
         {{- end}}
         {{- range $l := .Links}}
   --link {{printf "%q" $l}} \
         {{- end}}
+        {{- if .Mounts}}
+            {{- range .Mounts}}
+  --mount type={{.Type}},source={{.Source}},destination={{.Target}}{{- if .BindOptions}},bind-propagation={{.BindOptions.Propagation}}{{- end}}{{- if .ReadOnly}},readonly{{- end}} \
+            {{- end}}
+        {{- end}}
         {{- if .PublishAllPorts}}
   --publish-all \
         {{- end}}
@@ -117,4 +119,4 @@ docker run \
     {{- end}}
   {{printf "%q" .Image}} \
   {{range .Cmd}}{{printf "%q " .}}{{- end}}
-{{- end}}
+{{- end}}
diff --git a/run.tpl b/run.tpl
@@ -15,6 +15,9 @@ docker run \
         {{- end}}
         {{- range $v := .VolumesFrom}}
   --volumes-from {{printf "%q" $v}} \
+        {{- end}}
+        {{- range .Mounts}}
+  --mount type={{.Type}},source={{.Source}},destination={{.Target}}{{- if .BindOptions}},bind-propagation={{.BindOptions.Propagation}}{{- end}}{{- if .ReadOnly}},readonly{{- end}} \
         {{- end}}
         {{- range $l := .Links}}
   --link {{printf "%q" $l}} \
@@ -114,4 +117,4 @@ docker run \
     {{- end}}
   {{printf "%q" .Image}} \
   {{range .Cmd}}{{printf "%q " .}}{{- end}}
-{{- end}}
+{{- end}}
diff --git a/run.tpl b/run.tpl
@@ -1,34 +1,117 @@
 docker run \
-    --name {{.Name}} {{with .HostConfig}}\
-    {{if .Privileged}}--privileged \
-    {{end}}{{if .AutoRemove}}--rm \
-    {{end}}{{if .Runtime}}--runtime {{printf "%q" .Runtime}} \
-    {{end}}{{range $b := .Binds}}--volume {{printf "%q" $b}} \
-    {{end}}{{range $v := .VolumesFrom}}--volumes-from {{printf "%q" $v}} \
-    {{end}}{{range $l := .Links}}--link {{printf "%q" $l}} \
-    {{end}}{{if .PublishAllPorts}}--publish-all \
-    {{end}}{{if .UTSMode}}--uts {{printf "%q" .UTSMode}} \
-    {{end}}{{with .LogConfig}}--log-driver={{printf "%q" .Type}} \
-    {{range $o, $v := .Config}}--log-opt {{$o}}={{printf "%q" $v}} \
-    {{end}}{{end}}{{with .RestartPolicy}}--restart="{{.Name}}{{if eq .Name "on-failure"}}:{{.MaximumRetryCount}}{{end}}" \
-    {{end}}{{range $e := .ExtraHosts}}--add-host {{printf "%q" $e}} \
-    {{end}}{{range $v := .CapAdd}}--cap-add {{printf "%q" $v}} \
-    {{end}}{{range $v := .CapDrop}}--cap-drop {{printf "%q" $v}} \
-    {{end}}{{range $d := .Devices}}--device={{printf "%q" (index $d).PathOnHost}}:{{printf "%q" (index $d).PathInContainer}}:{{(index $d).CgroupPermissions}} \
-    {{end}}{{end}}{{with .NetworkSettings}}{{range $p, $conf := .Ports}}{{with $conf}}--publish {{if $h := (index $conf 0).HostIp}}{{$h}}:{{end}}{{(index $conf 0).HostPort}}:{{$p}} \
-    {{end}}{{end}}{{range $n, $conf := .Networks}}{{with $conf}}--network {{printf "%q" $n}} \
-    {{range $a := $conf.Aliases}}--network-alias {{printf "%q" $a}} \
-    {{end}}{{end}}{{end}}{{end}}{{with .Config}}{{if .Hostname}}--hostname {{printf "%q" .Hostname}} \
-    {{end}}{{if .Domainname}}--domainname {{printf "%q" .Domainname}} \
-    {{end}}{{range $p, $conf := .ExposedPorts}}--expose {{printf "%q" $p}} \
-    {{end}}{{range $e := .Env}}--env {{printf "%q" $e}} \
-    {{end}}{{range $l, $v := .Labels}}--label {{printf "%q" $l}}={{printf "%q" $v}} \
-    {{end}}{{if not (or .AttachStdin  (or .AttachStdout .AttachStderr))}}--detach \
-    {{end}}{{if .AttachStdin}}--attach stdin \
-    {{end}}{{if .AttachStdout}}--attach stdout \
-    {{end}}{{if .AttachStderr}}--attach stderr \
-    {{end}}{{if .Tty}}--tty \
-    {{end}}{{if .OpenStdin}}--interactive \
-    {{end}}{{if .Entrypoint}}--entrypoint="{{range $i, $v := .Entrypoint}}{{if $i}} {{end}}{{$v}}{{end}}" \
-    {{end}}{{printf "%q" .Image}} \
-    {{range .Cmd}} {{printf "%q" .}}{{end}}{{end}}
+  --name {{printf "%q" .Name}} \
+    {{- with .HostConfig}}
+        {{- if .Privileged}}
+  --privileged \
+        {{- end}}
+        {{- if .AutoRemove}}
+  --rm \
+        {{- end}}
+        {{- if .Runtime}}
+  --runtime {{printf "%q" .Runtime}} \
+        {{- end}}
+        {{- range $b := .Binds}}
+  --volume {{printf "%q" $b}} \
+        {{- end}}
+        {{- range $v := .VolumesFrom}}
+  --volumes-from {{printf "%q" $v}} \
+        {{- end}}
+        {{- range $l := .Links}}
+  --link {{printf "%q" $l}} \
+        {{- end}}
+        {{- if .PublishAllPorts}}
+  --publish-all \
+        {{- end}}
+        {{- if .UTSMode}}
+  --uts {{printf "%q" .UTSMode}} \
+        {{- end}}
+        {{- with .LogConfig}}
+  --log-driver {{printf "%q" .Type}} \
+            {{- range $o, $v := .Config}}
+  --log-opt {{$o}}={{printf "%q" $v}} \
+            {{- end}}
+        {{- end}}
+        {{- with .RestartPolicy}}
+  --restart "{{.Name -}}
+            {{- if eq .Name "on-failure"}}:{{.MaximumRetryCount}}
+            {{- end}}" \
+        {{- end}}
+        {{- range $e := .ExtraHosts}}
+  --add-host {{printf "%q" $e}} \
+        {{- end}}
+        {{- range $v := .CapAdd}}
+  --cap-add {{printf "%q" $v}} \
+        {{- end}}
+        {{- range $v := .CapDrop}}
+  --cap-drop {{printf "%q" $v}} \
+        {{- end}}
+        {{- range $d := .Devices}}
+  --device {{printf "%q" (index $d).PathOnHost}}:{{printf "%q" (index $d).PathInContainer}}:{{(index $d).CgroupPermissions}} \
+        {{- end}}
+    {{- end}}
+    {{- with .NetworkSettings -}}
+        {{- range $p, $conf := .Ports}}
+            {{- with $conf}}
+  --publish "
+                {{- if $h := (index $conf 0).HostIp}}{{$h}}:
+                {{- end}}
+                {{- (index $conf 0).HostPort}}:{{$p}}" \
+            {{- end}}
+        {{- end}}
+        {{- range $n, $conf := .Networks}}
+            {{- with $conf}}
+  --network {{printf "%q" $n}} \
+                {{- range $a := $conf.Aliases}}
+  --network-alias {{printf "%q" $a}} \
+                {{- end}}
+            {{- end}}
+        {{- end}}
+    {{- end}}
+    {{- with .Config}}
+        {{- if .Hostname}}
+  --hostname {{printf "%q" .Hostname}} \
+        {{- end}}
+        {{- if .Domainname}}
+  --domainname {{printf "%q" .Domainname}} \
+        {{- end}}
+        {{- range $p, $conf := .ExposedPorts}}
+  --expose {{printf "%q" $p}} \
+        {{- end}}
+        {{- range $e := .Env}}
+  --env {{printf "%q" $e}} \
+        {{- end}}
+        {{- range $l, $v := .Labels}}
+  --label {{printf "%q" $l}}={{printf "%q" $v}} \
+        {{- end}}
+    {{- if not (or .AttachStdin  (or .AttachStdout .AttachStderr))}}
+  --detach \
+    {{- end}}
+    {{- if .AttachStdin}}
+  --attach stdin \
+    {{- end}}
+    {{- if .AttachStdout}}
+  --attach stdout \
+    {{- end}}
+    {{- if .AttachStderr}}
+  --attach stderr \
+    {{- end}}
+    {{- if .Tty}}
+  --tty \
+    {{- end}}
+    {{- if .OpenStdin}}
+  --interactive \
+    {{- end}}
+    {{- if .Entrypoint}}
+{{- /* Since the entry point cannot be overridden from the command line with an array of size over 1,
+       we are fine assuming the default value in such a case. */ -}}
+        {{- if eq (len .Entrypoint) 1 }}
+  --entrypoint "
+            {{- range $i, $v := .Entrypoint}}
+                {{- if $i}} {{end}}
+                {{- $v}}
+            {{- end}}" \
+        {{- end}}
+    {{- end}}
+  {{printf "%q" .Image}} \
+  {{range .Cmd}}{{printf "%q " .}}{{- end}}
+{{- end}}
diff --git a/run.tpl b/run.tpl
@@ -1,24 +1,34 @@
 docker run \
-    --name={{.Name}} \
-    {{range $e := .Config.Env}}--env={{printf "%q" $e}} \
-    {{end}}{{range $p, $conf := .NetworkSettings.Ports}}{{with $conf}}-p {{(index $conf 0).HostIp}}:{{(index $conf 0).HostPort}}:{{$p}} \
-    {{end}}{{end}}{{range $n, $conf := .NetworkSettings.Networks}}{{with $conf}}--network {{printf "%q" $n}} \
-    {{range $conf.Aliases}}--network-alias {{printf "%q" .}} {{end}} \
-    {{end}}{{end}}{{range $v := .HostConfig.VolumesFrom}}--volumes-from={{printf "%q" .}} \
-    {{end}}{{range $v := .HostConfig.Binds}}--volume={{printf "%q" .}} \
-    {{end}}{{range $v := .HostConfig.Mounts}}--mount type={{printf "%q" .Type}},src={{printf "%q" .Source}},target={{printf "%q" .Target}},ro={{.ReadOnly}}{{if .BindOptions}},bind-propagation={{printf "%q" .BindOptions.Propagation}}{{end}} \
-    {{end}}{{range $l, $v := .Config.Labels}}--label {{printf "%q" $l}}={{printf "%q" $v}} \
-    {{end}}{{range $v := .HostConfig.CapAdd}}--cap-add {{printf "%q" .}} \
-    {{end}}{{range $v := .HostConfig.CapDrop}}--cap-drop {{printf "%q" .}} \
-    {{end}}{{range $d := .HostConfig.Devices}}--device={{printf "%q" (index $d).PathOnHost}}:{{printf "%q" (index $d).PathInContainer}}:{{(index $d).CgroupPermissions}} \
-    {{end}}{{if .Config.Entrypoint}}--entrypoint="{{range $i, $v := .Config.Entrypoint}}{{if $i}} {{end}}{{$v}}{{end}}" \
-    {{end}}{{with .HostConfig.LogConfig}}--log-driver={{printf "%q" .Type}} \
+    --name {{.Name}} {{with .HostConfig}}\
+    {{if .Privileged}}--privileged \
+    {{end}}{{if .AutoRemove}}--rm \
+    {{end}}{{if .Runtime}}--runtime {{printf "%q" .Runtime}} \
+    {{end}}{{range $b := .Binds}}--volume {{printf "%q" $b}} \
+    {{end}}{{range $v := .VolumesFrom}}--volumes-from {{printf "%q" $v}} \
+    {{end}}{{range $l := .Links}}--link {{printf "%q" $l}} \
+    {{end}}{{if .PublishAllPorts}}--publish-all \
+    {{end}}{{if .UTSMode}}--uts {{printf "%q" .UTSMode}} \
+    {{end}}{{with .LogConfig}}--log-driver={{printf "%q" .Type}} \
     {{range $o, $v := .Config}}--log-opt {{$o}}={{printf "%q" $v}} \
-    {{end}}{{end}}{{with .HostConfig.RestartPolicy}}--restart="{{.Name}}{{if eq .Name "on-failure"}}:{{.MaximumRetryCount}}{{end}}" \
-    {{end}}{{if .Config.Tty}}-t \
-    {{end}}{{if .Config.OpenStdin}}-i \
-    {{end}}{{if not (.Config.AttachStdout)}}--detach=true \
-    {{end}}{{if .HostConfig.Init}}--init \
-    {{end}}{{if .HostConfig.Privileged}}--privileged \
-    {{end}}{{printf "%q" .Config.Image}} \
-    {{range .Config.Cmd}}{{printf "%q" .}} {{end}}
+    {{end}}{{end}}{{with .RestartPolicy}}--restart="{{.Name}}{{if eq .Name "on-failure"}}:{{.MaximumRetryCount}}{{end}}" \
+    {{end}}{{range $e := .ExtraHosts}}--add-host {{printf "%q" $e}} \
+    {{end}}{{range $v := .CapAdd}}--cap-add {{printf "%q" $v}} \
+    {{end}}{{range $v := .CapDrop}}--cap-drop {{printf "%q" $v}} \
+    {{end}}{{range $d := .Devices}}--device={{printf "%q" (index $d).PathOnHost}}:{{printf "%q" (index $d).PathInContainer}}:{{(index $d).CgroupPermissions}} \
+    {{end}}{{end}}{{with .NetworkSettings}}{{range $p, $conf := .Ports}}{{with $conf}}--publish {{if $h := (index $conf 0).HostIp}}{{$h}}:{{end}}{{(index $conf 0).HostPort}}:{{$p}} \
+    {{end}}{{end}}{{range $n, $conf := .Networks}}{{with $conf}}--network {{printf "%q" $n}} \
+    {{range $a := $conf.Aliases}}--network-alias {{printf "%q" $a}} \
+    {{end}}{{end}}{{end}}{{end}}{{with .Config}}{{if .Hostname}}--hostname {{printf "%q" .Hostname}} \
+    {{end}}{{if .Domainname}}--domainname {{printf "%q" .Domainname}} \
+    {{end}}{{range $p, $conf := .ExposedPorts}}--expose {{printf "%q" $p}} \
+    {{end}}{{range $e := .Env}}--env {{printf "%q" $e}} \
+    {{end}}{{range $l, $v := .Labels}}--label {{printf "%q" $l}}={{printf "%q" $v}} \
+    {{end}}{{if not (or .AttachStdin  (or .AttachStdout .AttachStderr))}}--detach \
+    {{end}}{{if .AttachStdin}}--attach stdin \
+    {{end}}{{if .AttachStdout}}--attach stdout \
+    {{end}}{{if .AttachStderr}}--attach stderr \
+    {{end}}{{if .Tty}}--tty \
+    {{end}}{{if .OpenStdin}}--interactive \
+    {{end}}{{if .Entrypoint}}--entrypoint="{{range $i, $v := .Entrypoint}}{{if $i}} {{end}}{{$v}}{{end}}" \
+    {{end}}{{printf "%q" .Image}} \
+    {{range .Cmd}} {{printf "%q" .}}{{end}}{{end}}
diff --git a/run.tpl b/run.tpl
@@ -11,7 +11,7 @@ docker run \
     {{end}}{{range $v := .HostConfig.CapAdd}}--cap-add {{printf "%q" .}} \
     {{end}}{{range $v := .HostConfig.CapDrop}}--cap-drop {{printf "%q" .}} \
     {{end}}{{range $d := .HostConfig.Devices}}--device={{printf "%q" (index $d).PathOnHost}}:{{printf "%q" (index $d).PathInContainer}}:{{(index $d).CgroupPermissions}} \
-    {{end}}{{if .Config.Entrypoint}}--entrypoint="{{range $v := .Config.Entrypoint}}{{.}} {{end}}" \
+    {{end}}{{if .Config.Entrypoint}}--entrypoint="{{range $i, $v := .Config.Entrypoint}}{{if $i}} {{end}}{{$v}}{{end}}" \
     {{end}}{{with .HostConfig.LogConfig}}--log-driver={{printf "%q" .Type}} \
     {{range $o, $v := .Config}}--log-opt {{$o}}={{printf "%q" $v}} \
     {{end}}{{end}}{{with .HostConfig.RestartPolicy}}--restart="{{.Name}}{{if eq .Name "on-failure"}}:{{.MaximumRetryCount}}{{end}}" \

diff --git a/run.tpl b/run.tpl
@@ -6,7 +6,7 @@ docker run \
     {{range $conf.Aliases}}--network-alias {{printf "%q" .}} {{end}} \
     {{end}}{{end}}{{range $v := .HostConfig.VolumesFrom}}--volumes-from={{printf "%q" .}} \
     {{end}}{{range $v := .HostConfig.Binds}}--volume={{printf "%q" .}} \
-    {{end}}{{range $v := .HostConfig.Mounts}}--mount type={{printf "%q" .Type}},src={{printf "%q" .Source}},tgt={{printf "%q" .Target}},ro={{.ReadOnly}}{{if .BindOptions}},bind-propagation={{printf "%q" .BindOptions.Propagation}}{{end}} \
+    {{end}}{{range $v := .HostConfig.Mounts}}--mount type={{printf "%q" .Type}},src={{printf "%q" .Source}},target={{printf "%q" .Target}},ro={{.ReadOnly}}{{if .BindOptions}},bind-propagation={{printf "%q" .BindOptions.Propagation}}{{end}} \
     {{end}}{{range $l, $v := .Config.Labels}}--label {{printf "%q" $l}}={{printf "%q" $v}} \
     {{end}}{{range $v := .HostConfig.CapAdd}}--cap-add {{printf "%q" .}} \
     {{end}}{{range $v := .HostConfig.CapDrop}}--cap-drop {{printf "%q" .}} \

diff --git a/run.tpl b/run.tpl
@@ -6,17 +6,19 @@ docker run \
     {{range $conf.Aliases}}--network-alias {{printf "%q" .}} {{end}} \
     {{end}}{{end}}{{range $v := .HostConfig.VolumesFrom}}--volumes-from={{printf "%q" .}} \
     {{end}}{{range $v := .HostConfig.Binds}}--volume={{printf "%q" .}} \
+    {{end}}{{range $v := .HostConfig.Mounts}}--mount type={{printf "%q" .Type}},src={{printf "%q" .Source}},tgt={{printf "%q" .Target}},ro={{.ReadOnly}}{{if .BindOptions}},bind-propagation={{printf "%q" .BindOptions.Propagation}}{{end}} \
     {{end}}{{range $l, $v := .Config.Labels}}--label {{printf "%q" $l}}={{printf "%q" $v}} \
     {{end}}{{range $v := .HostConfig.CapAdd}}--cap-add {{printf "%q" .}} \
     {{end}}{{range $v := .HostConfig.CapDrop}}--cap-drop {{printf "%q" .}} \
     {{end}}{{range $d := .HostConfig.Devices}}--device={{printf "%q" (index $d).PathOnHost}}:{{printf "%q" (index $d).PathInContainer}}:{{(index $d).CgroupPermissions}} \
-    {{end}}{{range $v := .Config.Entrypoint}}--entrypoint={{printf "%q" .}} \
+    {{end}}{{if .Config.Entrypoint}}--entrypoint="{{range $v := .Config.Entrypoint}}{{.}} {{end}}" \
     {{end}}{{with .HostConfig.LogConfig}}--log-driver={{printf "%q" .Type}} \
     {{range $o, $v := .Config}}--log-opt {{$o}}={{printf "%q" $v}} \
     {{end}}{{end}}{{with .HostConfig.RestartPolicy}}--restart="{{.Name}}{{if eq .Name "on-failure"}}:{{.MaximumRetryCount}}{{end}}" \
     {{end}}{{if .Config.Tty}}-t \
     {{end}}{{if .Config.OpenStdin}}-i \
     {{end}}{{if not (.Config.AttachStdout)}}--detach=true \
+    {{end}}{{if .HostConfig.Init}}--init \
     {{end}}{{if .HostConfig.Privileged}}--privileged \
     {{end}}{{printf "%q" .Config.Image}} \
     {{range .Config.Cmd}}{{printf "%q" .}} {{end}}
diff --git a/run.tpl b/run.tpl
@@ -13,7 +13,7 @@ docker run \
     {{end}}{{range $v := .Config.Entrypoint}}--entrypoint={{printf "%q" .}} \
     {{end}}{{with .HostConfig.LogConfig}}--log-driver={{printf "%q" .Type}} \
     {{range $o, $v := .Config}}--log-opt {{$o}}={{printf "%q" $v}} \
-    {{end}}{{end}}{{with .HostConfig.RestartPolicy}}--restart="{{.Name}}{{if eq .Name "on-failure"}}{{.MaximumRetryCount}}{{end}}" \
+    {{end}}{{end}}{{with .HostConfig.RestartPolicy}}--restart="{{.Name}}{{if eq .Name "on-failure"}}:{{.MaximumRetryCount}}{{end}}" \
     {{end}}{{if .Config.Tty}}-t \
     {{end}}{{if .Config.OpenStdin}}-i \
     {{end}}{{if not (.Config.AttachStdout)}}--detach=true \

diff --git a/run.tpl b/run.tpl
@@ -1,21 +1,22 @@
 docker run \
     --name={{.Name}} \
-    {{range $e := .Config.Env}}--env="{{$e}}" \
-    {{end}}{{range $p, $conf := .NetworkSettings.Ports}}-p {{(index $conf 0).HostIp}}:{{(index $conf 0).HostPort}}:{{$p}} \
-    {{end}}{{range $v := .HostConfig.VolumesFrom}}--volumes-from="{{.}}" \
-    {{end}}{{range $v := .HostConfig.Binds}}--volume="{{.}}" \
-    {{end}}{{range $l, $v := .Config.Labels}}--label "{{$l}}"="{{$v}}" \
-    {{end}}{{range $v := .HostConfig.CapAdd}}--cap-add {{.}} \
-    {{end}}{{range $v := .HostConfig.CapDrop}}--cap-drop {{.}} \
-    {{end}}{{range $d := .HostConfig.Devices}}--device={{(index $d).PathOnHost}}:{{(index $d).PathInContainer}}:{{(index $d).CgroupPermissions}} \
-    {{end}}{{range $v := .Config.Entrypoint}}--entrypoint="{{.}}" \
-    {{end}}{{with .HostConfig.LogConfig}}--log-driver="{{.Type}}" \
-    {{range $o, $v := .Config}}--log-opt {{$o}}="{{$v}}" \
+    {{range $e := .Config.Env}}--env={{printf "%q" $e}} \
+    {{end}}{{range $p, $conf := .NetworkSettings.Ports}}{{with $conf}}-p {{(index $conf 0).HostIp}}:{{(index $conf 0).HostPort}}:{{$p}} \
+    {{end}}{{end}}{{range $n, $conf := .NetworkSettings.Networks}}{{with $conf}}--network {{printf "%q" $n}} \
+    {{range $conf.Aliases}}--network-alias {{printf "%q" .}} {{end}} \
+    {{end}}{{end}}{{range $v := .HostConfig.VolumesFrom}}--volumes-from={{printf "%q" .}} \
+    {{end}}{{range $v := .HostConfig.Binds}}--volume={{printf "%q" .}} \
+    {{end}}{{range $l, $v := .Config.Labels}}--label {{printf "%q" $l}}={{printf "%q" $v}} \
+    {{end}}{{range $v := .HostConfig.CapAdd}}--cap-add {{printf "%q" .}} \
+    {{end}}{{range $v := .HostConfig.CapDrop}}--cap-drop {{printf "%q" .}} \
+    {{end}}{{range $d := .HostConfig.Devices}}--device={{printf "%q" (index $d).PathOnHost}}:{{printf "%q" (index $d).PathInContainer}}:{{(index $d).CgroupPermissions}} \
+    {{end}}{{range $v := .Config.Entrypoint}}--entrypoint={{printf "%q" .}} \
+    {{end}}{{with .HostConfig.LogConfig}}--log-driver={{printf "%q" .Type}} \
+    {{range $o, $v := .Config}}--log-opt {{$o}}={{printf "%q" $v}} \
     {{end}}{{end}}{{with .HostConfig.RestartPolicy}}--restart="{{.Name}}{{if eq .Name "on-failure"}}{{.MaximumRetryCount}}{{end}}" \
     {{end}}{{if .Config.Tty}}-t \
     {{end}}{{if .Config.OpenStdin}}-i \
     {{end}}{{if not (.Config.AttachStdout)}}--detach=true \
     {{end}}{{if .HostConfig.Privileged}}--privileged \
-    {{end}}{{if .HostConfig.AutoRemove}}--rm \
-    {{end}}{{.Config.Image}} \
-    {{range .Config.Cmd}}{{.}} {{end}}
+    {{end}}{{printf "%q" .Config.Image}} \
+    {{range .Config.Cmd}}{{printf "%q" .}} {{end}}
diff --git a/run.tpl b/run.tpl
@@ -7,7 +7,8 @@ docker run \
     {{end}}{{range $l, $v := .Config.Labels}}--label "{{$l}}"="{{$v}}" \
     {{end}}{{range $v := .HostConfig.CapAdd}}--cap-add {{.}} \
     {{end}}{{range $v := .HostConfig.CapDrop}}--cap-drop {{.}} \
-    {{end}}{{with .Config.Entrypoint}}--entrypoint="{{.}}" \
+    {{end}}{{range $d := .HostConfig.Devices}}--device={{(index $d).PathOnHost}}:{{(index $d).PathInContainer}}:{{(index $d).CgroupPermissions}} \
+    {{end}}{{range $v := .Config.Entrypoint}}--entrypoint="{{.}}" \
     {{end}}{{with .HostConfig.LogConfig}}--log-driver="{{.Type}}" \
     {{range $o, $v := .Config}}--log-opt {{$o}}="{{$v}}" \
     {{end}}{{end}}{{with .HostConfig.RestartPolicy}}--restart="{{.Name}}{{if eq .Name "on-failure"}}{{.MaximumRetryCount}}{{end}}" \
@@ -17,4 +18,4 @@ docker run \
     {{end}}{{if .HostConfig.Privileged}}--privileged \
     {{end}}{{if .HostConfig.AutoRemove}}--rm \
     {{end}}{{.Config.Image}} \
-    {{range .Config.Cmd}}{{.}} {{end}}
+    {{range .Config.Cmd}}{{.}} {{end}}
diff --git a/run.tpl b/run.tpl
@@ -4,6 +4,7 @@ docker run \
     {{end}}{{range $p, $conf := .NetworkSettings.Ports}}-p {{(index $conf 0).HostIp}}:{{(index $conf 0).HostPort}}:{{$p}} \
     {{end}}{{range $v := .HostConfig.VolumesFrom}}--volumes-from="{{.}}" \
     {{end}}{{range $v := .HostConfig.Binds}}--volume="{{.}}" \
+    {{end}}{{range $l, $v := .Config.Labels}}--label "{{$l}}"="{{$v}}" \
     {{end}}{{range $v := .HostConfig.CapAdd}}--cap-add {{.}} \
     {{end}}{{range $v := .HostConfig.CapDrop}}--cap-drop {{.}} \
     {{end}}{{with .Config.Entrypoint}}--entrypoint="{{.}}" \

diff --git a/run.tpl b/run.tpl
@@ -14,5 +14,6 @@ docker run \
     {{end}}{{if .Config.OpenStdin}}-i \
     {{end}}{{if not (.Config.AttachStdout)}}--detach=true \
     {{end}}{{if .HostConfig.Privileged}}--privileged \
+    {{end}}{{if .HostConfig.AutoRemove}}--rm \
     {{end}}{{.Config.Image}} \
     {{range .Config.Cmd}}{{.}} {{end}}
diff --git a/run.tpl b/run.tpl
@@ -7,8 +7,12 @@ docker run \
     {{end}}{{range $v := .HostConfig.CapAdd}}--cap-add {{.}} \
     {{end}}{{range $v := .HostConfig.CapDrop}}--cap-drop {{.}} \
     {{end}}{{with .Config.Entrypoint}}--entrypoint="{{.}}" \
-    {{end}}{{with .HostConfig.RestartPolicy}}--restart="{{.Name}}{{if eq .Name "on-failure"}}{{.MaximumRetryCount}}{{end}}" \
+    {{end}}{{with .HostConfig.LogConfig}}--log-driver="{{.Type}}" \
+    {{range $o, $v := .Config}}--log-opt {{$o}}="{{$v}}" \
+    {{end}}{{end}}{{with .HostConfig.RestartPolicy}}--restart="{{.Name}}{{if eq .Name "on-failure"}}{{.MaximumRetryCount}}{{end}}" \
     {{end}}{{if .Config.Tty}}-t \
     {{end}}{{if .Config.OpenStdin}}-i \
+    {{end}}{{if not (.Config.AttachStdout)}}--detach=true \
+    {{end}}{{if .HostConfig.Privileged}}--privileged \
     {{end}}{{.Config.Image}} \
     {{range .Config.Cmd}}{{.}} {{end}}
diff --git a/run.tpl b/run.tpl
@@ -0,0 +1,14 @@
+docker run \
+    --name={{.Name}} \
+    {{range $e := .Config.Env}}--env="{{$e}}" \
+    {{end}}{{range $p, $conf := .NetworkSettings.Ports}}-p {{(index $conf 0).HostIp}}:{{(index $conf 0).HostPort}}:{{$p}} \
+    {{end}}{{range $v := .HostConfig.VolumesFrom}}--volumes-from="{{.}}" \
+    {{end}}{{range $v := .HostConfig.Binds}}--volume="{{.}}" \
+    {{end}}{{range $v := .HostConfig.CapAdd}}--cap-add {{.}} \
+    {{end}}{{range $v := .HostConfig.CapDrop}}--cap-drop {{.}} \
+    {{end}}{{with .Config.Entrypoint}}--entrypoint="{{.}}" \
+    {{end}}{{with .HostConfig.RestartPolicy}}--restart="{{.Name}}{{if eq .Name "on-failure"}}{{.MaximumRetryCount}}{{end}}" \
+    {{end}}{{if .Config.Tty}}-t \
+    {{end}}{{if .Config.OpenStdin}}-i \
+    {{end}}{{.Config.Image}} \
+    {{range .Config.Cmd}}{{.}} {{end}}