diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-06-09 15:54:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-09 15:54:24 -0400 |
| commit | 6498187103bd951304ce8112b927d430347513e0 (patch) | |
| tree | da011100ff9ed6f868f18b2df5cf19f8014744b0 /roles/openshift_cli/templates | |
| parent | 078e5dca2d945fc789bce1f90432a19b6a8db75f (diff) | |
| parent | e272847e1a195d8ca74103fd87c7207b68c0d919 (diff) | |
| download | openshift-6498187103bd951304ce8112b927d430347513e0.tar.gz openshift-6498187103bd951304ce8112b927d430347513e0.tar.bz2 openshift-6498187103bd951304ce8112b927d430347513e0.tar.xz openshift-6498187103bd951304ce8112b927d430347513e0.zip | |
Merge pull request #2005 from brenton/bz1338726
Bug 1338726 - never abort install if the latest version of docker is already installed
Diffstat (limited to 'roles/openshift_cli/templates')
| -rw-r--r-- | roles/openshift_cli/templates/openshift.j2 | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/roles/openshift_cli/templates/openshift.j2 b/roles/openshift_cli/templates/openshift.j2 index 437e08aab..8a3f3a257 100644 --- a/roles/openshift_cli/templates/openshift.j2 +++ b/roles/openshift_cli/templates/openshift.j2 @@ -5,14 +5,14 @@ fi cmd=`basename $0` user=`id -u` group=`id -g` -image_tag={{ openshift_version }} +image_tag="{{ openshift_version }}" >&2 echo """ ================================================================================ ATTENTION: You are running ${cmd} via a wrapper around 'docker run {{ openshift.common.cli_image }}:${image_tag}'. This wrapper is intended only to be used to bootstrap an environment. Please install client tools on another host once you have granted cluster-admin -privileges to a user. +privileges to a user. {% if openshift.common.deployment_type in ['openshift-enterprise','atomic-enterprise'] %} See https://docs.openshift.com/enterprise/latest/cli_reference/get_started_cli.html {% else %} @@ -21,4 +21,8 @@ See https://docs.openshift.org/latest/cli_reference/get_started_cli.html ================================================================================= """ -docker run -i --privileged --net=host --user=${user}:${group} -v ~/.kube:/root/.kube -v /tmp:/tmp -v {{ openshift.common.config_base}}:{{ openshift.common.config_base }} -e KUBECONFIG=/root/.kube/config --entrypoint ${cmd} --rm {{ openshift.common.cli_image }}:${image_tag} "${@}" +if [ -n "$image_tag" ]; then + image_tag=":$image_tag" +fi + +docker run -i --privileged --net=host --user=${user}:${group} -v ~/.kube:/root/.kube -v /tmp:/tmp -v {{ openshift.common.config_base}}:{{ openshift.common.config_base }} -e KUBECONFIG=/root/.kube/config --entrypoint ${cmd} --rm {{ openshift.common.cli_image }}${image_tag} "${@}" |