d859a4ed5b
Install python-redis package to docker containers #### Why I did it This this bug: https://github.com/sonic-net/sonic-buildimage/issues/14531 The 'flush_unused_database' is part of docker-database, and docker-database does not install python-redis package by itself. it's using redis installed by sonic-py-swsssdk. So after remove sonic-py-swsssdk from container, this script break. To this this bug and avoid similer bug happen again, install python-redis to docker containers which removed sonic-py-swsssdk . #### How I did it Install python-redis to containers. #### How to verify it Pass all UT. Create new UT to cover this scenario: https://github.com/sonic-net/sonic-mgmt/pull/8032 #### Description for the changelog Improve sudo cat command for RO user.
56 lines
1.9 KiB
Django/Jinja
56 lines
1.9 KiB
Django/Jinja
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
|
|
FROM docker-base-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
|
|
|
|
## Make apt-get non-interactive
|
|
ENV DEBIAN_FRONTEND=noninteractive
|
|
|
|
RUN apt-get update && \
|
|
apt-get install -y \
|
|
apt-utils \
|
|
build-essential \
|
|
python3-dev
|
|
|
|
{%- if CONFIGURED_ARCH == "armhf" or CONFIGURED_ARCH == "arm64" %}
|
|
RUN apt-get install -y \
|
|
libxslt-dev \
|
|
libz-dev
|
|
{%- endif %}
|
|
|
|
# For sonic-config-engine Python 3 package
|
|
# Explicitly install pyangbind here, as pyangbind causes enum34 to be installed.
|
|
# enum34 causes Python 're' package to not work properly as it redefines an incompatible enum.py module
|
|
# https://github.com/robshakir/pyangbind/issues/232
|
|
RUN pip3 install pyangbind==0.8.1
|
|
RUN pip3 uninstall -y enum34
|
|
|
|
# Install python-redis
|
|
RUN pip3 install redis==4.5.4
|
|
|
|
{% if docker_config_engine_buster_debs.strip() %}
|
|
# Copy locally-built Debian package dependencies
|
|
{{ copy_files("debs/", docker_config_engine_buster_debs.split(' '), "/debs/") }}
|
|
|
|
# Install locally-built Debian packages and implicitly install their dependencies
|
|
{{ install_debian_packages(docker_config_engine_buster_debs.split(' ')) }}
|
|
{% endif %}
|
|
|
|
{% if docker_config_engine_buster_whls.strip() %}
|
|
# Copy locally-built Python wheel dependencies
|
|
{{ copy_files("python-wheels/", docker_config_engine_buster_whls.split(' '), "/python-wheels/") }}
|
|
|
|
# Install locally-built Python wheel dependencies
|
|
{{ install_python_wheels(docker_config_engine_buster_whls.split(' ')) }}
|
|
{% endif %}
|
|
|
|
# Copy files
|
|
COPY ["files/swss_vars.j2", "/usr/share/sonic/templates/"]
|
|
|
|
## Clean up
|
|
RUN apt-get purge -y \
|
|
python3-dev \
|
|
build-essential && \
|
|
apt-get clean -y && \
|
|
apt-get autoclean -y && \
|
|
apt-get autoremove -y && \
|
|
rm -rf /debs /python-wheels ~/.cache
|