[lldp]: expose lldpcli command of lldp docker to host (#3473)

Lldp can not be configured in host environment, so we expose lldpcli command of lldp docker to host for configuring more convenient.
sonic-net · Sep 18, 2019 · 503d87b · 503d87b
1 parent 8ca1eb2
commit 503d87b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/dockers/docker-lldp-sv2/base_image_files/lldpcli b/dockers/docker-lldp-sv2/base_image_files/lldpcli
@@ -0,0 +1,10 @@
+#!/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 lldp lldpcli "$@"
diff --git a/rules/docker-lldp-sv2.mk b/rules/docker-lldp-sv2.mk
@@ -29,3 +29,4 @@ $(DOCKER_LLDP_SV2)_RUN_OPT += --net=host --privileged -t
 $(DOCKER_LLDP_SV2)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 
 $(DOCKER_LLDP_SV2)_BASE_IMAGE_FILES += lldpctl:/usr/bin/lldpctl
+$(DOCKER_LLDP_SV2)_BASE_IMAGE_FILES += lldpcli:/usr/bin/lldpcli
Original file line number	Diff line number	Diff line change
Expand Up		@@ -29,3 +29,4 @@ $(DOCKER_LLDP_SV2)_RUN_OPT += --net=host --privileged -t
		$(DOCKER_LLDP_SV2)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro

		$(DOCKER_LLDP_SV2)_BASE_IMAGE_FILES += lldpctl:/usr/bin/lldpctl
		$(DOCKER_LLDP_SV2)_BASE_IMAGE_FILES += lldpcli:/usr/bin/lldpcli