0c44d3ddff
Why I did it We Nokia took the task to make macsec container to work with bookworm. This PR requires another PR for sonic-wpa-supplicant(sonic-net/sonic-wpa-supplicant#80) to be in first. Otherwise sonic build will fail for bookworm wpasupplicant debian package. How I did it How to verify it After build and boot up system with new image, macsec container should run with bookworm. Corresponding mgmt macsec suite will work here. Which release branch to backport (provide reason below if selected) Tested branch (Please provide the tested image version) Tested with latest master of sonic-buildimage. Built vs image and loaded into vs testing environment. Code pass with macsec test suites. Description for the changelog Make macsec container to build with bookworm
32 lines
1.0 KiB
Django/Jinja
32 lines
1.0 KiB
Django/Jinja
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
|
|
FROM docker-swss-layer-bookworm-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
|
|
|
|
ARG docker_container_name
|
|
|
|
## Make apt-get non-interactive
|
|
ENV DEBIAN_FRONTEND=noninteractive
|
|
|
|
RUN apt-get update
|
|
|
|
{% if docker_macsec_debs.strip() -%}
|
|
# Copy locally-built Debian package dependencies
|
|
{{ copy_files("debs/", docker_macsec_debs.split(' '), "/debs/") }}
|
|
|
|
# Install locally-built Debian packages and implicitly install their dependencies
|
|
{{ install_debian_packages(docker_macsec_debs.split(' ')) }}
|
|
{%- endif %}
|
|
|
|
RUN apt-get clean -y && \
|
|
apt-get autoclean -y && \
|
|
apt-get autoremove -y && \
|
|
rm -rf /debs
|
|
|
|
COPY ["start.sh", "/usr/bin/"]
|
|
COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
|
|
COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
|
|
COPY ["critical_processes", "/etc/supervisor"]
|
|
COPY ["etc/wpa_supplicant.conf", "/etc/wpa_supplicant.conf"]
|
|
COPY ["cli", "/cli/"]
|
|
|
|
ENTRYPOINT ["/usr/local/bin/supervisord"]
|