diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-01-07 11:53:42 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-01-07 11:53:42 -0500 |
| commit | e807b15822a68aed9ed8d1c07a3b623bd4ad8cc3 (patch) | |
| tree | 1d50a23c991806e726ff2987fd63618ae65551d4 | |
| parent | dd93ec9ae0ec8d9e9cf9c1cf5c7f0efa3746749c (diff) | |
| parent | fdb1b0c6b600e3fe91e48c812b66658e3d9dad68 (diff) | |
| download | openshift-e807b15822a68aed9ed8d1c07a3b623bd4ad8cc3.tar.gz openshift-e807b15822a68aed9ed8d1c07a3b623bd4ad8cc3.tar.bz2 openshift-e807b15822a68aed9ed8d1c07a3b623bd4ad8cc3.tar.xz openshift-e807b15822a68aed9ed8d1c07a3b623bd4ad8cc3.zip | |
Merge pull request #1115 from sdodson/bz1295677
Fix multi-word arguments & cli wrapper stdin plumbing
| -rw-r--r-- | roles/openshift_cli/templates/openshift.j2 | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/roles/openshift_cli/templates/openshift.j2 b/roles/openshift_cli/templates/openshift.j2 index cade4d1a7..d773e9b1c 100644 --- a/roles/openshift_cli/templates/openshift.j2 +++ b/roles/openshift_cli/templates/openshift.j2 @@ -6,11 +6,4 @@ cmd=`basename $0` user=`id -u` group=`id -g` -# docker can only split stderr and stdin when run without -t -# https://github.com/docker/docker/issues/725 -# ansible checks various streams DO NOT CROSS THE STREAMS -if [ -z $TERM ]; then - $t = '-it' -fi - -docker run ${t} -a STDERR -a STDOUT -a STDIN --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 }} ${@}
\ No newline at end of file +docker run -i -a STDERR -a STDOUT -a STDIN --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 }} "${@}" |