Unify the docker command, command_inject, and command_wrapper

This commit is contained in:
Eric Rasche
2015-09-23 10:34:36 -05:00
parent 183e5cd7c6
commit 52dfd589b9
3 changed files with 45 additions and 39 deletions
@@ -1,5 +1,4 @@
[main]
# Following options are ignored if using the Galaxy dynamic proxy but
# are useful if mapping a range of ports for environment consumption.
#apache_urls = False
@@ -7,26 +6,18 @@
#ssl = False
[docker]
# Command to execute docker. For example `sudo docker` or `docker-lxc`.
command = docker
# Command to launch docker container. For example `sudo docker` or `docker-lxc`.
# If you need to use a command like `sg` you can do that here, just be sure to
# wrap all of the docker portion in single quotes. E.g. `sg 'docker' 'docker {docker_args}'`
command = docker run --sig-proxy=true -e DEBUG=false {docker_args}
# The docker image name that should be started.
image = bgruening/docker-ipython-notebook:dev
# Additional arguments that are passed to the `docker run` command.
command_inject = --sig-proxy=true -e DEBUG=false
# Command to wrap around the full docker command.
# For example, `sg 'docker' '{cmd}'` where {cmd} will be replaced by the full
# docker command. Make sure to surround the {cmd} with single quotes(').
# Default: empty
#command_wrapper =
# URL to access the Galaxy API with from the spawn Docker containter, if empty
# this falls back to galaxy.ini's galaxy_infrastructure_url and finally to the
# Docker host of the spawned container if that is also not set.
#galaxy_url =
#galaxy_url =
# The Docker hostname. It can be useful to run the Docker daemon on a different
# host than Galaxy.
@@ -35,4 +26,4 @@ command_inject = --sig-proxy=true -e DEBUG=false
# Try to set the tempdirectory to world execute - this can fix the issue
# where 'sudo docker' is not able to mount the folder otherwise.
# "finalize namespace chdir to /import permission denied"
wx_tempdir = False
wx_tempdir = False