From f45d7f8df13b3d53b88a270208cc128bd20cceb5 Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Wed, 13 Jun 2018 15:44:52 -0700 Subject: [PATCH] Don't create a pty to run vtysh inside of the docker container --- dockers/docker-fpm-frr/base_image_files/vtysh | 9 +-------- dockers/docker-fpm-quagga/base_image_files/vtysh | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/dockers/docker-fpm-frr/base_image_files/vtysh b/dockers/docker-fpm-frr/base_image_files/vtysh index 8f8cb2e67960..c479fcd3653b 100755 --- a/dockers/docker-fpm-frr/base_image_files/vtysh +++ b/dockers/docker-fpm-frr/base_image_files/vtysh @@ -1,10 +1,3 @@ #!/bin/bash -DOCKER_EXEC_FLAGS="i" - -# Determine whether stdout is on a terminal -if [ -t 1 ] ; then - DOCKER_EXEC_FLAGS+="t" -fi - -docker exec -$DOCKER_EXEC_FLAGS bgp vtysh "$@" +docker exec -i bgp vtysh "$@" diff --git a/dockers/docker-fpm-quagga/base_image_files/vtysh b/dockers/docker-fpm-quagga/base_image_files/vtysh index 8f8cb2e67960..c479fcd3653b 100755 --- a/dockers/docker-fpm-quagga/base_image_files/vtysh +++ b/dockers/docker-fpm-quagga/base_image_files/vtysh @@ -1,10 +1,3 @@ #!/bin/bash -DOCKER_EXEC_FLAGS="i" - -# Determine whether stdout is on a terminal -if [ -t 1 ] ; then - DOCKER_EXEC_FLAGS+="t" -fi - -docker exec -$DOCKER_EXEC_FLAGS bgp vtysh "$@" +docker exec -i bgp vtysh "$@"