From 4e4168d1006760a4637c690edfa6c3f5da88ba83 Mon Sep 17 00:00:00 2001 From: Marian Pritsak Date: Thu, 8 Dec 2016 17:07:54 +0200 Subject: [PATCH] Rename docker-orchagent to docker-orchagent-mlnx (#108) --- platform/mellanox/docker-orchagent-mlnx.mk | 7 +++++++ platform/mellanox/rules.mk | 3 ++- rules/docker-orchagent.mk | 7 ------- 3 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 platform/mellanox/docker-orchagent-mlnx.mk delete mode 100644 rules/docker-orchagent.mk diff --git a/platform/mellanox/docker-orchagent-mlnx.mk b/platform/mellanox/docker-orchagent-mlnx.mk new file mode 100644 index 0000000000..6db369a797 --- /dev/null +++ b/platform/mellanox/docker-orchagent-mlnx.mk @@ -0,0 +1,7 @@ +# docker image for orchagent + +DOCKER_ORCHAGENT_MLNX = docker-orchagent-mlnx.gz +$(DOCKER_ORCHAGENT_MLNX)_PATH = $(DOCKERS_PATH)/docker-orchagent +$(DOCKER_ORCHAGENT_MLNX)_DEPENDS += $(SWSS) +$(DOCKER_ORCHAGENT_MLNX)_LOAD_DOCKERS += $(DOCKER_BASE) +SONIC_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_MLNX) diff --git a/platform/mellanox/rules.mk b/platform/mellanox/rules.mk index b6d1056071..a31d22fc25 100644 --- a/platform/mellanox/rules.mk +++ b/platform/mellanox/rules.mk @@ -4,9 +4,10 @@ include $(PLATFORM_PATH)/mft.mk include $(PLATFORM_PATH)/mlnx-sai.mk include $(PLATFORM_PATH)/hw-management.mk include $(PLATFORM_PATH)/docker-syncd-mlnx.mk +include $(PLATFORM_PATH)/docker-orchagent-mlnx.mk SONIC_ALL += $(DOCKER_SYNCD_MLNX) \ - $(DOCKER_ORCHAGENT) \ + $(DOCKER_ORCHAGENT_MLNX) \ $(DOCKER_FPM) \ $(DOCKER_DATABASE) \ $(DOCKER_LLDP_SV2) \ diff --git a/rules/docker-orchagent.mk b/rules/docker-orchagent.mk deleted file mode 100644 index c4bd99fac0..0000000000 --- a/rules/docker-orchagent.mk +++ /dev/null @@ -1,7 +0,0 @@ -# docker image for orchagent - -DOCKER_ORCHAGENT = docker-orchagent.gz -$(DOCKER_ORCHAGENT)_PATH = $(DOCKERS_PATH)/docker-orchagent -$(DOCKER_ORCHAGENT)_DEPENDS += $(SWSS) -$(DOCKER_ORCHAGENT)_LOAD_DOCKERS += $(DOCKER_BASE) -SONIC_DOCKER_IMAGES += $(DOCKER_ORCHAGENT)