File tree 9 files changed +16
-10
lines changed
docker-config-engine-stretch
9 files changed +16
-10
lines changed Original file line number Diff line number Diff line change @@ -73,6 +73,10 @@ RUN apt-get -y install {{ dbg_pkg }}
73
73
RUN ln /usr/bin/vim.tiny /usr/bin/vim
74
74
{% - endif %}
75
75
76
+ # Remove python3.4
77
+ # Note: if later python3 is required by more docker images, consider install homebrew python3 here instead of in SNMP image only
78
+ RUN apt-get purge -y libpython3.4-minimal
79
+
76
80
# Clean up apt
77
81
# Remove /var/lib/apt/lists/*, could be obsoleted for derived images
78
82
RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
Original file line number Diff line number Diff line change @@ -43,5 +43,5 @@ python-wheels/{{ whl }}{{' '}}
43
43
{% - endif -%}
44
44
45
45
## Clean up
46
- RUN apt-get remove -y python-pip python-dev; apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
46
+ RUN apt-get purge -y python-pip python-dev; apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
47
47
RUN rm -rf /debs /python-wheels
Original file line number Diff line number Diff line change @@ -43,5 +43,5 @@ python-wheels/{{ whl }}{{' '}}
43
43
{% - endif -%}
44
44
45
45
## Clean up
46
- RUN apt-get remove -y python-pip python-dev; apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
46
+ RUN apt-get purge -y python-pip python-dev; apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
47
47
RUN rm -rf /debs /python-wheels
Original file line number Diff line number Diff line change @@ -35,7 +35,7 @@ RUN pip install /python-wheels/{{ whl }}
35
35
{% endif %}
36
36
37
37
# Clean up
38
- RUN apt-get remove -y python-pip
38
+ RUN apt-get purge -y python-pip
39
39
RUN apt-get clean -y
40
40
RUN apt-get autoclean -y
41
41
RUN apt-get autoremove -y
Original file line number Diff line number Diff line change @@ -46,7 +46,7 @@ RUN pip install /python-wheels/{{ whl }}
46
46
{% endif %}
47
47
48
48
# Clean up
49
- RUN apt-get remove -y python-pip
49
+ RUN apt-get purge -y python-pip
50
50
RUN apt-get clean -y
51
51
RUN apt-get autoclean -y
52
52
RUN apt-get autoremove -y
Original file line number Diff line number Diff line change @@ -60,7 +60,9 @@ RUN pip install /python-wheels/{{ whl }}
60
60
RUN python3.6 -m sonic_ax_impl install
61
61
62
62
# Clean up
63
- RUN apt-get -y purge libpython3.6-dev curl gcc make libdpkg-perl
63
+ RUN apt-get -y purge libpython3.6-dev libpython3.6 curl gcc make libdpkg-perl
64
+ # Note: these packages should be removed with autoremove but actually not, so explicitly purged
65
+ RUN apt-get -y purge libldap-2.4-2 libsasl2-2 libsasl2-modules libsasl2-modules-db
64
66
RUN apt-get clean -y && apt-get autoclean -y && apt-get autoremove -y --purge
65
67
RUN find / | grep -E "__pycache__" | xargs rm -rf
66
68
RUN rm -rf /debs /python-wheels ~/.cache
Original file line number Diff line number Diff line change @@ -29,9 +29,9 @@ RUN apt-get install -y default-jre
29
29
RUN apt-get install -y rsyslog psmisc
30
30
31
31
# Remove cffi 1.5.2, will install 1.10.0 by pip later
32
- RUN apt-get remove -y python-cffi python-cffi-backend
32
+ RUN apt-get purge -y python-cffi python-cffi-backend
33
33
# Remove pycparser 2.14, will install >=2.17 by pip later
34
- RUN apt-get remove -y python-ply python-pycparser
34
+ RUN apt-get purge -y python-ply python-pycparser
35
35
36
36
RUN easy_install pip
37
37
Original file line number Diff line number Diff line change @@ -311,7 +311,7 @@ sudo LANG=C cp $SCRIPTS_DIR/syncd.sh $FILESYSTEM_ROOT/usr/local/bin/syncd.sh
311
311
sudo cp $BUILD_TEMPLATES /snmp.timer $FILESYSTEM_ROOT /etc/systemd/system/
312
312
sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable snmp.timer
313
313
314
- sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get remove -y python-dev
314
+ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get purge -y python-dev
315
315
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get clean -y
316
316
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get autoremove -y
317
317
Original file line number Diff line number Diff line change @@ -26,8 +26,8 @@ $(PY3_MIN)_RDEPENDS += $(LIBPY3_MIN)
26
26
27
27
PY3 = $(PYTHON_PNAME ) _$(PYTHON_VER ) _amd64.deb
28
28
$(eval $(call add_derived_package,$(LIBPY3_MIN),$(PY3)))
29
- $(PY3)_DEPENDS += $(PY3_MIN ) $(LIBPY3 )
30
- $(PY3)_RDEPENDS += $(PY3_MIN ) $(LIBPY3 ) $( LIBPY3_MIN )
29
+ $(PY3)_DEPENDS += $(PY3_MIN ) $(LIBPY3_STD )
30
+ $(PY3)_RDEPENDS += $(PY3_MIN ) $(LIBPY3_STD )
31
31
32
32
LIBPY3_DEV = lib$(PYTHON_PNAME ) -dev_$(PYTHON_VER ) _amd64.deb
33
33
$(eval $(call add_derived_package,$(LIBPY3_MIN),$(LIBPY3_DEV)))
You can’t perform that action at this time.
0 commit comments