Skip to content

Commit f614c76

Browse files
committed
[docker-radvd]: upgrade docker radvd to stretch based
1 parent f206650 commit f614c76

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

dockers/docker-router-advertiser/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker-config-engine
1+
FROM docker-config-engine-stretch
22

33
ARG docker_container_name
44
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf

rules/docker-router-advertiser.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
DOCKER_ROUTER_ADVERTISER = docker-router-advertiser.gz
44
$(DOCKER_ROUTER_ADVERTISER)_PATH = $(DOCKERS_PATH)/docker-router-advertiser
5-
$(DOCKER_ROUTER_ADVERTISER)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE)
5+
$(DOCKER_ROUTER_ADVERTISER)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE_STRETCH)
66
SONIC_DOCKER_IMAGES += $(DOCKER_ROUTER_ADVERTISER)
77
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_ROUTER_ADVERTISER)
8-
8+
SONIC_STRETCH_DOCKERS += $(DOCKER_ROUTER_ADVERTISER)
99

1010
$(DOCKER_ROUTER_ADVERTISER)_CONTAINER_NAME = radv
1111
$(DOCKER_ROUTER_ADVERTISER)_RUN_OPT += --net=host --privileged -t

slave.mk

+2-1
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,8 @@ clean : .platform clean-logs $$(SONIC_CLEAN_DEBS) $$(SONIC_CLEAN_FILES) $$(SONIC
666666
all : .platform $$(addprefix $(TARGET_PATH)/,$$(SONIC_ALL))
667667

668668
stretch : $$(addprefix $(DEBS_PATH)/,$$(SONIC_STRETCH_DEBS)) \
669-
$$(addprefix $(FILES_PATH)/,$$(SONIC_STRETCH_FILES))
669+
$$(addprefix $(FILES_PATH)/,$$(SONIC_STRETCH_FILES)) \
670+
$$(addprefix $(TARGET_PATH)/,$$(SONIC_STRETCH_DOCKERS))
670671

671672

672673
###############################################################################

0 commit comments

Comments
 (0)