From f682e7b131eafac822dffe6eca6a9dcc1a5d5c06 Mon Sep 17 00:00:00 2001
From: lguohan <lguohan@gmail.com>
Date: Wed, 6 Feb 2019 21:28:07 -0800
Subject: [PATCH] [docker-radvd]: upgrade docker radvd to stretch based (#2524)

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

* install jinja>=2.10

Signed-off-by: Guohan Lu <gulv@microsoft.com>

* install pip packages for testing sonic-utilities

Signed-off-by: Guohan Lu <gulv@microsoft.com>

* set storage driver to vfs

Signed-off-by: Guohan Lu <gulv@microsoft.com>
---
 dockers/docker-router-advertiser/Dockerfile.j2 |  2 +-
 rules/docker-router-advertiser.mk              |  4 ++--
 slave.mk                                       |  3 ++-
 sonic-slave-stretch/Dockerfile                 | 11 ++++++++---
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/dockers/docker-router-advertiser/Dockerfile.j2 b/dockers/docker-router-advertiser/Dockerfile.j2
index 1385e1ebec63..40589f2e6e43 100644
--- 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
index 129246d8fa2d..90c7b6fa89ea 100644
--- 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
index 63829be0791b..f1fa937c7f73 100644
--- 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))
 
 
 ###############################################################################
diff --git a/sonic-slave-stretch/Dockerfile b/sonic-slave-stretch/Dockerfile
index 717ee25419df..d1a75d20c42e 100644
--- a/sonic-slave-stretch/Dockerfile
+++ b/sonic-slave-stretch/Dockerfile
@@ -229,11 +229,16 @@ RUN pip install \
         ctypesgen \
         crc16
 
+# For sonic config engine testing
+RUN pip install pyangbind==0.6.0
+# Note: force upgrade debian packaged jinja2, if installed
+RUN pip install --force-reinstall --upgrade jinja2>=2.10
+
 # For templating
 RUN pip install j2cli
 
-# For sonic config engine testing
-RUN pip install pyangbind==0.5.10
+# For sonic utilities testing
+RUN pip install click-default-group click natsort tabulate netifaces==0.10.7 fastentrypoints
 
 # For supervisor build
 RUN pip install meld3 mock
@@ -265,4 +270,4 @@ RUN add-apt-repository \
            stable"
 RUN apt-get update
 RUN apt-get install -y docker-ce=17.03.2~ce-0~debian-stretch
-RUN echo "DOCKER_OPTS=\"--experimental\"" >> /etc/default/docker
+RUN echo "DOCKER_OPTS=\"--experimental --storage-driver=vfs\"" >> /etc/default/docker