From 5dafa907b203a906fb452e2420036edc9a5222e9 Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Mon, 6 Mar 2017 12:22:42 -0800 Subject: [PATCH] [dockers]: Add base image files to syncd-brcm, database and teamd (#380) --- dockers/docker-database/base_image_files/redis-cli | 4 ++++ dockers/docker-teamd/base_image_files/teamdctl | 4 ++++ platform/broadcom/docker-syncd-brcm.mk | 3 +++ platform/broadcom/docker-syncd-brcm/base_image_files/bcmcmd | 4 ++++ rules/docker-database.mk | 2 ++ rules/docker-teamd.mk | 3 +++ 6 files changed, 20 insertions(+) create mode 100755 dockers/docker-database/base_image_files/redis-cli create mode 100755 dockers/docker-teamd/base_image_files/teamdctl create mode 100755 platform/broadcom/docker-syncd-brcm/base_image_files/bcmcmd diff --git a/dockers/docker-database/base_image_files/redis-cli b/dockers/docker-database/base_image_files/redis-cli new file mode 100755 index 0000000000..646992f65a --- /dev/null +++ b/dockers/docker-database/base_image_files/redis-cli @@ -0,0 +1,4 @@ +#!/bin/bash + +docker exec -it database redis-cli "$@" + diff --git a/dockers/docker-teamd/base_image_files/teamdctl b/dockers/docker-teamd/base_image_files/teamdctl new file mode 100755 index 0000000000..c7f59d3214 --- /dev/null +++ b/dockers/docker-teamd/base_image_files/teamdctl @@ -0,0 +1,4 @@ +#!/bin/bash + +docker exec -i teamd teamdctl "$@" + diff --git a/platform/broadcom/docker-syncd-brcm.mk b/platform/broadcom/docker-syncd-brcm.mk index b1353cc2f8..1e5e7a34ad 100644 --- a/platform/broadcom/docker-syncd-brcm.mk +++ b/platform/broadcom/docker-syncd-brcm.mk @@ -14,3 +14,6 @@ $(DOCKER_SYNCD_BRCM)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf $(DOCKER_SYNCD_BRCM)_RUN_OPT += -v /var/run/docker-syncd:/var/run/sswsyncd $(DOCKER_SYNCD_BRCM)_RUN_OPT += --volumes-from database $(DOCKER_SYNCD_BRCM)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro + +$(DOCKER_SYNCD_BRCM)_BASE_IMAGE_FILES += bcmcmd:/usr/bin/bcmcmd + diff --git a/platform/broadcom/docker-syncd-brcm/base_image_files/bcmcmd b/platform/broadcom/docker-syncd-brcm/base_image_files/bcmcmd new file mode 100755 index 0000000000..ee87a93cdf --- /dev/null +++ b/platform/broadcom/docker-syncd-brcm/base_image_files/bcmcmd @@ -0,0 +1,4 @@ +#!/bin/bash + +docker exec -i syncd bcmcmd "$@" + diff --git a/rules/docker-database.mk b/rules/docker-database.mk index 168164a026..9a80040381 100644 --- a/rules/docker-database.mk +++ b/rules/docker-database.mk @@ -11,3 +11,5 @@ $(DOCKER_DATABASE)_CONTAINER_NAME = database $(DOCKER_DATABASE)_RUN_OPT += --net=host --privileged -t $(DOCKER_DATABASE)_RUN_OPT += -v /var/run/redis +$(DOCKER_DATABASE)_BASE_IMAGE_FILES += redis-cli:/usr/bin/redis-cli + diff --git a/rules/docker-teamd.mk b/rules/docker-teamd.mk index cc97e24fe4..932e2aee0f 100644 --- a/rules/docker-teamd.mk +++ b/rules/docker-teamd.mk @@ -11,3 +11,6 @@ $(DOCKER_TEAMD)_CONTAINER_NAME = teamd $(DOCKER_TEAMD)_RUN_OPT += --net=host --privileged -t $(DOCKER_TEAMD)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro $(DOCKER_TEAMD)_RUN_OPT += --volumes-from database + +$(DOCKER_TEAMD)_BASE_IMAGE_FILES += teamdctl:/usr/bin/teamdctl +