diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-01-05 11:31:52 -0500 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2016-01-06 10:03:52 -0500 |
| commit | fdb1b0c6b600e3fe91e48c812b66658e3d9dad68 (patch) | |
| tree | 923221775a003972d54b906073e0207554e8038a /roles | |
| parent | b70fde9b1204a12e4e2099619ecf8b066c2b33b1 (diff) | |
| download | openshift-fdb1b0c6b600e3fe91e48c812b66658e3d9dad68.tar.gz openshift-fdb1b0c6b600e3fe91e48c812b66658e3d9dad68.tar.bz2 openshift-fdb1b0c6b600e3fe91e48c812b66658e3d9dad68.tar.xz openshift-fdb1b0c6b600e3fe91e48c812b66658e3d9dad68.zip | |
Fix multi-word arguments & cli wrapper stdin plumbing
Fixes https://bugzilla.redhat.com/1295677
Fixes `echo "foo" | oc create -f -`
Diffstat (limited to 'roles')
| -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 }} "${@}" |