Move run into python from template

config/plugins/interactive_environments/ipython/config/ipython.ini.sample

@@ -14,7 +14,7 @@
 # additional parameters. This command string is re-used for a `docker inspect`
 # command and will likely cause errors if it is extensively modified, past the
 # usual group/sudo changes.
-#command = docker run {docker_args}
+#command = docker {docker_args}
 
 # The docker image name that should be started.
 image = bgruening/docker-ipython-notebook:dev

config/plugins/interactive_environments/rstudio/config/rstudio.ini.sample

@@ -15,7 +15,7 @@ password_auth = True
 # additional parameters. This command string is re-used for a `docker inspect`
 # command and will likely cause errors if it is extensively modified, past the
 # usual group/sudo changes.
-#command = docker run {docker_args}
+#command = docker {docker_args}
 
 # The docker image name that should be started.
 image = erasche/docker-rstudio-notebook:dev

lib/galaxy/web/base/interactive_environments.py

@@ -190,7 +190,7 @@ def docker_cmd(self, env_override={}, volumes=[]):
         # Then we format in the entire docker command in place of
         # {docker_args}, so as to let the admin not worry about which args are
         # getting passed
-        command = command.format(docker_args='{command_inject} {environment} -d -p {port_ext}:{port_int} -v "{temp_dir}:/import/" {volume_str} {image}')
+        command = command.format(docker_args='run {command_inject} {environment} -d -p {port_ext}:{port_int} -v "{temp_dir}:/import/" {volume_str} {image}')
         # Once that's available, we format again with all of our arguments
         command = command.format(
             command_inject=self.attr.viz_config.get("docker", "command_inject"),