From b8a330e774574dc9e853915a1f553ee233bcae49 Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Mon, 29 Apr 2019 17:21:24 -0700
Subject: [PATCH] Remove unused packages in docker images and host (#2807)

* Remove unneeded packages in docker images and host
* Remove libpython3.6 from snmp docker image
---
 dockers/docker-base/Dockerfile.j2               | 4 ++++
 dockers/docker-config-engine/Dockerfile.j2      | 2 +-
 dockers/docker-lldp-sv2/Dockerfile.j2           | 2 +-
 dockers/docker-platform-monitor/Dockerfile.j2   | 2 +-
 dockers/docker-snmp-sv2/Dockerfile.j2           | 3 ++-
 dockers/docker-sonic-mgmt/Dockerfile.j2         | 4 ++--
 files/build_templates/sonic_debian_extension.j2 | 2 +-
 rules/python3.mk                                | 4 ++--
 8 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/dockers/docker-base/Dockerfile.j2 b/dockers/docker-base/Dockerfile.j2
index 15d3faf57c81..14465fde9925 100644
--- a/dockers/docker-base/Dockerfile.j2
+++ b/dockers/docker-base/Dockerfile.j2
@@ -76,6 +76,10 @@ RUN apt-get -y install {{ dbg_pkg }}
 RUN ln /usr/bin/vim.tiny /usr/bin/vim
 {%- endif %}
 
+# Remove python3.4
+# Note: if later python3 is required by more docker images, consider install homebrew python3 here instead of in SNMP image only
+RUN apt-get purge -y libpython3.4-minimal
+
 # Clean up apt
 # Remove /var/lib/apt/lists/*, could be obsoleted for derived images
 RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
diff --git a/dockers/docker-config-engine/Dockerfile.j2 b/dockers/docker-config-engine/Dockerfile.j2
index bc82e1ca2883..ba72cce31d47 100644
--- a/dockers/docker-config-engine/Dockerfile.j2
+++ b/dockers/docker-config-engine/Dockerfile.j2
@@ -43,5 +43,5 @@ python-wheels/{{ whl }}{{' '}}
 {%- endif -%}
 
 ## Clean up
-RUN apt-get remove -y python-pip python-dev; apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
+RUN apt-get purge -y python-pip python-dev; apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
 RUN rm -rf /debs /python-wheels
diff --git a/dockers/docker-lldp-sv2/Dockerfile.j2 b/dockers/docker-lldp-sv2/Dockerfile.j2
index f75e4ea31422..8cd1cbb10003 100644
--- a/dockers/docker-lldp-sv2/Dockerfile.j2
+++ b/dockers/docker-lldp-sv2/Dockerfile.j2
@@ -34,7 +34,7 @@ RUN pip install /python-wheels/{{ whl }}
 {% endif %}
 
 # Clean up
-RUN apt-get remove -y python-pip
+RUN apt-get purge -y python-pip
 RUN apt-get clean -y
 RUN apt-get autoclean -y
 RUN apt-get autoremove -y
diff --git a/dockers/docker-platform-monitor/Dockerfile.j2 b/dockers/docker-platform-monitor/Dockerfile.j2
index 4dd8acaf0e26..6169281b664d 100755
--- a/dockers/docker-platform-monitor/Dockerfile.j2
+++ b/dockers/docker-platform-monitor/Dockerfile.j2
@@ -35,7 +35,7 @@ RUN pip install /python-wheels/*.whl
 {% endif %}
 
 # Clean up
-RUN apt-get remove -y python-pip
+RUN apt-get purge -y python-pip
 RUN apt-get clean -y
 RUN apt-get autoclean -y
 RUN apt-get autoremove -y
diff --git a/dockers/docker-snmp-sv2/Dockerfile.j2 b/dockers/docker-snmp-sv2/Dockerfile.j2
index da46cb9b1cfb..46274ff8373c 100644
--- a/dockers/docker-snmp-sv2/Dockerfile.j2
+++ b/dockers/docker-snmp-sv2/Dockerfile.j2
@@ -35,7 +35,8 @@ RUN apt-get update && apt-get install -y libperl5.20 libpci3 libwrap0 \
     python3.6 -m pip install --no-cache-dir /python-wheels/*py3*.whl hiredis && \
     rm -rf /python-wheels && \
     python3.6 -m sonic_ax_impl install && \
-    apt-get -y purge libpython3.6-dev libexpat1-dev curl gcc && \
+    apt-get -y purge libpython3.6-dev libpython3.6 libexpat1-dev curl gcc && \
+    apt-get -y purge libldap-2.4-2 libsasl2-2 libsasl2-modules libsasl2-modules-db && \
     apt-get clean -y && apt-get autoclean -y && apt-get autoremove -y --purge && \
     find / | grep -E "__pycache__" | xargs rm -rf && \
     rm -rf ~/.cache
diff --git a/dockers/docker-sonic-mgmt/Dockerfile.j2 b/dockers/docker-sonic-mgmt/Dockerfile.j2
index d587fc69e541..a72c1eb05ed1 100644
--- a/dockers/docker-sonic-mgmt/Dockerfile.j2
+++ b/dockers/docker-sonic-mgmt/Dockerfile.j2
@@ -29,9 +29,9 @@ RUN apt-get install -y default-jre
 RUN apt-get install -y rsyslog psmisc
 
 # Remove cffi 1.5.2, will install 1.10.0 by pip later
-RUN apt-get remove -y python-cffi python-cffi-backend
+RUN apt-get purge -y python-cffi python-cffi-backend
 # Remove pycparser 2.14, will install >=2.17 by pip later
-RUN apt-get remove -y python-ply python-pycparser
+RUN apt-get purge -y python-ply python-pycparser
 
 RUN easy_install pip
 
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 8e64cb7e6dcb..947e6006f754 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -291,7 +291,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT umount -lf /sys
 sudo cp $BUILD_TEMPLATES/snmp.timer $FILESYSTEM_ROOT/etc/systemd/system/
 sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable snmp.timer
 
-sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get remove -y python-dev 
+sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get purge -y python-dev
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get clean -y
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get autoremove -y 
 
diff --git a/rules/python3.mk b/rules/python3.mk
index 2473c9aeb498..247a80b0cbea 100644
--- a/rules/python3.mk
+++ b/rules/python3.mk
@@ -26,8 +26,8 @@ $(PY3_MIN)_RDEPENDS += $(LIBPY3_MIN)
 
 PY3 = $(PYTHON_PNAME)_$(PYTHON_VER)_amd64.deb
 $(eval $(call add_derived_package,$(LIBPY3_MIN),$(PY3)))
-$(PY3)_DEPENDS += $(PY3_MIN) $(LIBPY3)
-$(PY3)_RDEPENDS += $(PY3_MIN) $(LIBPY3) $(LIBPY3_MIN)
+$(PY3)_DEPENDS += $(PY3_MIN) $(LIBPY3_STD)
+$(PY3)_RDEPENDS += $(PY3_MIN) $(LIBPY3_STD)
 
 LIBPY3_DEV = lib$(PYTHON_PNAME)-dev_$(PYTHON_VER)_amd64.deb
 $(eval $(call add_derived_package,$(LIBPY3_MIN),$(LIBPY3_DEV)))