Skip to content

Commit

Permalink
#2 implements SILO_DOCKER_CMD to enable user to override the docker c…
Browse files Browse the repository at this point in the history
…ommand
  • Loading branch information
dschroeder committed Jul 24, 2017
1 parent c1fb679 commit 02f0e3c
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions silo/runner
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ fi
# Globals:
# SILO_DEBUG
# BUNDLE_VERSION
# SILO_DOCKER_CMD
# SILO_IMAGE
# SILO_IMAGE_SHORT
# SILO_VERSION
Expand All @@ -66,9 +67,13 @@ fi
# None
#######################################
run() {
local command func
local command docker_cmd docker_default func

command="$(command -v docker) run --interactive --tty --rm"
# SILO_DOCKER_CMD can be set by the user to override the default docker
# command
docker_default="$(command -v docker)"
docker_cmd="${SILO_DOCKER_CMD:-${docker_default}}"
command="${docker_cmd} run --interactive --tty --rm"

# SILO_IMAGE_SHORT is defined in silo/runner_functions.sh and contains the
# basename of the Docker image. Below test checks if this is the ansible-silo
Expand Down

0 comments on commit 02f0e3c

Please sign in to comment.