Skip to content

Commit

Permalink
little refactoring in athena.docker.run_container_with_default_router
Browse files Browse the repository at this point in the history
athena.docker.run_container_with_default_router can now be called
multiple times.. this will still add/re-add docker options so that they
might be in the ATHENA_DOCKER_OPTS array multiple times but the
image/tag, command and arguments are always set to the latest ones
  • Loading branch information
savar committed Feb 1, 2017
1 parent 91e27b7 commit 665156b
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions lib/functions.docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -554,14 +554,10 @@ function athena.docker.run_container_with_default_router()
athena.docker.mount_dir "$(athena.plugin.get_shared_lib_dir)" "/opt/shared"
athena.docker.mount_dir "$(athena.plugin.get_plg_dir)" "/opt/athena"
athena.docker.mount_dir "$(athena.plugin.get_bootstrap_dir)" "/opt/bootstrap"
athena.docker.add_option "--name" "$name"
athena.docker.add_option "$tag_name"
athena.docker.add_option "$router"
athena.docker.add_option "$athena_command"

athena.argument.get_arguments athena_arguments
athena.docker.get_options docker_opts
athena.docker.run "${docker_opts[@]}" "${athena_arguments[@]}"
athena.docker.run "${docker_opts[@]}" --name "$name" "$tag_name" "$router" "$athena_command" "${athena_arguments[@]}"
}

# This function specifies that the default router should not be used.
Expand Down

0 comments on commit 665156b

Please sign in to comment.