From fdb1b0c6b600e3fe91e48c812b66658e3d9dad68 Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Tue, 5 Jan 2016 11:31:52 -0500 Subject: Fix multi-word arguments & cli wrapper stdin plumbing Fixes https://bugzilla.redhat.com/1295677 Fixes `echo "foo" | oc create -f -` --- roles/openshift_cli/templates/openshift.j2 | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'roles/openshift_cli') 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 }} "${@}" -- cgit v1.2.3