From d4d25674dcbd53a3f3192dd1b94a5f084b0e03f9 Mon Sep 17 00:00:00 2001 From: wumiao Date: Thu, 29 Aug 2024 13:28:24 -0400 Subject: [PATCH] Use bookworm macsec container for 2205. --- dockers/docker-macsec/Dockerfile.j2 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dockers/docker-macsec/Dockerfile.j2 b/dockers/docker-macsec/Dockerfile.j2 index a1c8e7045..29d786cb3 100644 --- a/dockers/docker-macsec/Dockerfile.j2 +++ b/dockers/docker-macsec/Dockerfile.j2 @@ -1,3 +1,11 @@ +{% set use_bookworm_macsec_container = true %} + +{% if use_bookworm_macsec_container -%} +FROM publicmirror.azurecr.io/docker-macsec:202405 +RUN mkdir /etc/fips && echo 1 > /etc/fips/fips_enable +COPY ["cli", "/cli/"] +ENTRYPOINT ["/usr/local/bin/supervisord"] +{% else %} {% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files, cleanup_apt_and_python_cache %} FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}} @@ -27,3 +35,5 @@ COPY ["etc/wpa_supplicant.conf", "/etc/wpa_supplicant.conf"] COPY ["cli", "/cli/"] ENTRYPOINT ["/usr/local/bin/supervisord"] + +{%- endif %}