From 89ae01acbba8632f257db5ce46d6fe80850e175f Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Wed, 1 Mar 2017 23:44:56 +0000
Subject: [PATCH 1/2] Update docker-py, keep pip

---
 build_debian.sh                                 | 9 ++++++---
 files/build_templates/sonic_debian_extension.j2 | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/build_debian.sh b/build_debian.sh
index 16f31f980ada..9543b3f4889c 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -166,6 +166,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install      \
 ## Note: gdisk is needed for sgdisk in install.sh
 ## Note: parted is needed for partprobe in install.sh
 ## Note: ca-certificates is needed for easy_install
+## Note: don't install python-apt by pip, older than Debian repo one
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install      \
     file                    \
     ifupdown                \
@@ -230,10 +231,12 @@ set /files/etc/sysctl.conf/net.ipv6.conf.all.accept_dad 0
 " -r $FILESYSTEM_ROOT
 
 ## docker-py is needed by Ansible docker module
+## Note: not ambigous docker-py version is supported, tested for Ansible v2.2.1.0
+## ref: https://github.com/ansible/ansible/issues/20380
+## ref: https://github.com/ansible/ansible/issues/21348
 sudo LANG=C chroot $FILESYSTEM_ROOT easy_install pip
-sudo LANG=C chroot $FILESYSTEM_ROOT pip install 'docker-py==1.6.0'
-## Remove pip which is unnecessary in the base image
-sudo LANG=C chroot $FILESYSTEM_ROOT pip uninstall -y pip
+sudo LANG=C chroot $FILESYSTEM_ROOT pip install 'docker-py==1.10.6'
+## Note: keep pip installed for maintainance purpose
 
 ## Config DHCP for eth0
 sudo tee -a $FILESYSTEM_ROOT/etc/network/interfaces > /dev/null <<EOF
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 8a2a8f988b70..59d4db809f67 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -59,6 +59,7 @@ sudo mkdir -p $FILESYSTEM_ROOT/usr/share/sonic/templates/
 sudo cp $IMAGE_CONFIGS/minigraph/minigraph_{{sonic_hwsku}}.xml $FILESYSTEM_ROOT/etc/sonic/minigraph.xml
 
 # Install dependencies for SONiC config engine
+# TODO: pip-install instead of apt-get after config engine wrapped into a wheel, even better use pip implicitly installing dependencies
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install \
     python-lxml    \
     python-jinja2  \

From 8b3e222d0079b20f30b95d59e6e8c826e7aa89c2 Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Thu, 2 Mar 2017 21:53:39 +0000
Subject: [PATCH 2/2] Use original version docker-py to prevent playbook break

---
 build_debian.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/build_debian.sh b/build_debian.sh
index 9543b3f4889c..85126bf34e89 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -231,11 +231,8 @@ set /files/etc/sysctl.conf/net.ipv6.conf.all.accept_dad 0
 " -r $FILESYSTEM_ROOT
 
 ## docker-py is needed by Ansible docker module
-## Note: not ambigous docker-py version is supported, tested for Ansible v2.2.1.0
-## ref: https://github.com/ansible/ansible/issues/20380
-## ref: https://github.com/ansible/ansible/issues/21348
 sudo LANG=C chroot $FILESYSTEM_ROOT easy_install pip
-sudo LANG=C chroot $FILESYSTEM_ROOT pip install 'docker-py==1.10.6'
+sudo LANG=C chroot $FILESYSTEM_ROOT pip install 'docker-py==1.6.0'
 ## Note: keep pip installed for maintainance purpose
 
 ## Config DHCP for eth0