Skip to content

[Base image files] All 'docker exec' wrapper scripts now dynamically adjust their flags depending on whether or not they are run on a terminal #1507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lguohan merged 1 commit into from
Mar 17, 2018
Merged

[Base image files] All 'docker exec' wrapper scripts now dynamically adjust their flags depending on whether or not they are run on a terminal #1507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion dockers/docker-database/base_image_files/redis-cli
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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 "$@"