8506826348
* Update Redis DB start options for multi-asic and chassis cases Starting with Redis 7.0 (specifically, redis/redis#9034), setting a custom `--bind` address on the command line no longer disables protected mode (which blocks connections from non-localhost IP addresses unless a password is set). For multi-asic and chassis database DBs, we currently specify a non-localhost IP address and do not specify any password, which means this change would break things there. To work around this, if we are specifying a non-localhost IP address on the command line, then disable protected mode. * Clean up debug pacakge list for docker-teamd The debug pacakges for swss and libswsscommon are already installed by docker-swss-layer-bookworm and docker-config-engine-bookworm, so they don't need to be specified here again. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
60 lines
2.1 KiB
Django/Jinja
60 lines
2.1 KiB
Django/Jinja
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
|
|
FROM docker-base-bookworm-{{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 \
|
|
python3-yaml
|
|
|
|
{%- 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.2
|
|
RUN pip3 uninstall -y enum34
|
|
|
|
# Install python-redis
|
|
RUN pip3 install redis==5.0.1
|
|
|
|
{% if docker_config_engine_bookworm_debs.strip() %}
|
|
# Copy locally-built Debian package dependencies
|
|
{{ copy_files("debs/", docker_config_engine_bookworm_debs.split(' '), "/debs/") }}
|
|
|
|
# Install locally-built Debian packages and implicitly install their dependencies
|
|
{{ install_debian_packages(docker_config_engine_bookworm_debs.split(' ')) }}
|
|
{% endif %}
|
|
|
|
{% if docker_config_engine_bookworm_whls.strip() %}
|
|
# Copy locally-built Python wheel dependencies
|
|
{{ copy_files("python-wheels/", docker_config_engine_bookworm_whls.split(' '), "/python-wheels/") }}
|
|
|
|
# Install locally-built Python wheel dependencies
|
|
{{ install_python_wheels(docker_config_engine_bookworm_whls.split(' ')) }}
|
|
{% endif %}
|
|
|
|
# Copy files
|
|
COPY ["files/swss_vars.j2", "/usr/share/sonic/templates/"]
|
|
COPY ["files/readiness_probe.sh", "/usr/bin/"]
|
|
COPY ["files/container_startup.py", "/usr/share/sonic/scripts/"]
|
|
COPY ["00-load-omprog.conf", "/etc/rsyslog.d/"]
|
|
|
|
## 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
|