Skip to content

Commit

Permalink
[base image files] All 'docker exec' wrapper scripts now dynamically …
Browse files Browse the repository at this point in the history
…adjust their flags depending on whether or not they are run on a terminal (#1507)
  • Loading branch information
jleveque authored and lguohan committed Mar 17, 2018
1 parent 066137e commit e1cb2ac
Show file tree
Hide file tree
Showing 7 changed files with 61 additions and 7 deletions.
9 changes: 8 additions & 1 deletion dockers/docker-database/base_image_files/redis-cli
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
#!/bin/bash

docker exec -it database redis-cli "$@"
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 database redis-cli "$@"
10 changes: 9 additions & 1 deletion dockers/docker-fpm-frr/base_image_files/vtysh
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
#!/bin/bash
docker exec -it bgp vtysh "$@"

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 "$@"
10 changes: 9 additions & 1 deletion dockers/docker-fpm-quagga/base_image_files/vtysh
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
#!/bin/bash
docker exec -it bgp vtysh "$@"

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 "$@"
10 changes: 9 additions & 1 deletion dockers/docker-lldp-sv2/base_image_files/lldpctl
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
#!/bin/bash
docker exec -i lldp lldpctl "$@"

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 lldp lldpctl "$@"
10 changes: 9 additions & 1 deletion dockers/docker-orchagent/base_image_files/swssloglevel
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
#!/bin/bash
docker exec -i swss swssloglevel "$@"

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 swss swssloglevel "$@"
10 changes: 9 additions & 1 deletion dockers/docker-platform-monitor/base_image_files/sensors
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
#!/bin/bash
docker exec -i pmon sensors "$@"

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 pmon sensors "$@"
9 changes: 8 additions & 1 deletion dockers/docker-teamd/base_image_files/teamdctl
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
#!/bin/bash

docker exec -i teamd teamdctl "$@"
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 teamd teamdctl "$@"

0 comments on commit e1cb2ac

Please sign in to comment.