Skip to content

Commit

Permalink
[syncd]: Add socat and bcmsh wrapper (#1657)
Browse files Browse the repository at this point in the history
* [syncd]: Add socat and bcmsh wrapper
* Install socat in docker-base
* Add hint banner, add host wrapper
* Refine banner message
  • Loading branch information
qiluo-msft authored May 4, 2018
1 parent 724aaf1 commit f3f8b9f
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 1 deletion.
3 changes: 3 additions & 0 deletions dockers/docker-base/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ RUN apt-get -y install \
python \
less

# Pre-install troubleshooting packages
RUN apt-get -y install socat

COPY ["etc/rsyslog.conf", "/etc/rsyslog.conf"]
COPY ["etc/rsyslog.d/*", "/etc/rsyslog.d/"]
COPY ["root/.vimrc", "/root/.vimrc"]
Expand Down
2 changes: 1 addition & 1 deletion platform/broadcom/docker-syncd-brcm/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ debs/{{ deb }}{{' '}}
## TODO: add kmod into Depends
RUN apt-get install -f kmod

COPY ["files/dsserve", "files/bcmcmd", "start.sh", "/usr/bin/"]
COPY ["files/dsserve", "files/bcmcmd", "start.sh", "bcmsh", "/usr/bin/"]
RUN chmod +x /usr/bin/dsserve /usr/bin/bcmcmd

COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
Expand Down
3 changes: 3 additions & 0 deletions platform/broadcom/docker-syncd-brcm/base_image_files/bcmsh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash

docker exec -i syncd bcmsh "$@"
35 changes: 35 additions & 0 deletions platform/broadcom/docker-syncd-brcm/bcmsh
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
#!/bin/bash
usage="$(basename "$0") [-h] [-q] -- interactive shell for bcm service
where:
-h show this help text
-q quite, no banner (default: verbose)"

banner="Press Enter to show prompt.
Press Ctrl+C to exit.
"

# Default verbose
quiet=false

while getopts 'hq' option; do
case "$option" in
h) echo "$usage"
exit
;;
q) quiet=true
;;
\?) printf "illegal option: -%s\n" "$OPTARG" >&2
echo "$usage" >&2
exit 1
;;
esac
done
shift $((OPTIND - 1))

if [ "$quiet" = false ]; then
echo "$banner"
fi

/usr/bin/socat - UNIX-CONNECT:/var/run/sswsyncd/sswsyncd.socket

0 comments on commit f3f8b9f

Please sign in to comment.