[docker-radvd]: upgrade docker radvd to stretch based

sonic-net · Feb 5, 2019 · f614c76 · f614c76
1 parent f206650
commit f614c76
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/dockers/docker-router-advertiser/Dockerfile.j2 b/dockers/docker-router-advertiser/Dockerfile.j2
@@ -1,4 +1,4 @@
-FROM docker-config-engine
+FROM docker-config-engine-stretch
 
 ARG docker_container_name
 RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf

diff --git a/rules/docker-router-advertiser.mk b/rules/docker-router-advertiser.mk
@@ -2,10 +2,10 @@
 
 DOCKER_ROUTER_ADVERTISER = docker-router-advertiser.gz
 $(DOCKER_ROUTER_ADVERTISER)_PATH = $(DOCKERS_PATH)/docker-router-advertiser
-$(DOCKER_ROUTER_ADVERTISER)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE)
+$(DOCKER_ROUTER_ADVERTISER)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE_STRETCH)
 SONIC_DOCKER_IMAGES += $(DOCKER_ROUTER_ADVERTISER)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_ROUTER_ADVERTISER)
-
+SONIC_STRETCH_DOCKERS += $(DOCKER_ROUTER_ADVERTISER)
 
 $(DOCKER_ROUTER_ADVERTISER)_CONTAINER_NAME = radv
 $(DOCKER_ROUTER_ADVERTISER)_RUN_OPT += --net=host --privileged -t

diff --git a/slave.mk b/slave.mk
@@ -666,7 +666,8 @@ clean : .platform clean-logs $$(SONIC_CLEAN_DEBS) $$(SONIC_CLEAN_FILES) $$(SONIC
 all : .platform $$(addprefix $(TARGET_PATH)/,$$(SONIC_ALL))
 
 stretch : $$(addprefix $(DEBS_PATH)/,$$(SONIC_STRETCH_DEBS)) \
-          $$(addprefix $(FILES_PATH)/,$$(SONIC_STRETCH_FILES))
+          $$(addprefix $(FILES_PATH)/,$$(SONIC_STRETCH_FILES)) \
+          $$(addprefix $(TARGET_PATH)/,$$(SONIC_STRETCH_DOCKERS))
 
 
 ###############################################################################