diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-07-21 12:13:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-21 12:13:10 -0400 |
| commit | d0c75ba21ba84a9df4a6cd12f02ce335ea4f9427 (patch) | |
| tree | ca3493c5fa3cd56d98a48312148040d2e8b430d2 /roles/openshift_cli/templates/openshift.j2 | |
| parent | a355349a98cecec1d10e7d166aa70d8e77df20e1 (diff) | |
| parent | ca7767eab6674737a117a09f7f456b7918cffecf (diff) | |
| download | openshift-d0c75ba21ba84a9df4a6cd12f02ce335ea4f9427.tar.gz openshift-d0c75ba21ba84a9df4a6cd12f02ce335ea4f9427.tar.bz2 openshift-d0c75ba21ba84a9df4a6cd12f02ce335ea4f9427.tar.xz openshift-d0c75ba21ba84a9df4a6cd12f02ce335ea4f9427.zip | |
Merge pull request #2168 from dgoodwin/container-cli-speed
Copy openshift binary instead of using wrapper script.
Diffstat (limited to 'roles/openshift_cli/templates/openshift.j2')
| -rw-r--r-- | roles/openshift_cli/templates/openshift.j2 | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/roles/openshift_cli/templates/openshift.j2 b/roles/openshift_cli/templates/openshift.j2 deleted file mode 100644 index 7786acead..000000000 --- a/roles/openshift_cli/templates/openshift.j2 +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -if [ ! -d ~/.kube ]; then - mkdir -m 0700 ~/.kube -fi -cmd=`basename $0` -user=`id -u` -group=`id -g` -image_tag="{{ openshift_image_tag }}" - ->&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. -{% if openshift.common.deployment_type in ['openshift-enterprise','atomic-enterprise'] %} -See https://docs.openshift.com/enterprise/latest/cli_reference/get_started_cli.html -{% else %} -See https://docs.openshift.org/latest/cli_reference/get_started_cli.html -{% endif %} -================================================================================= -""" - -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} "${@}" |