diff --git a/dockers/docker-fpm-frr/00-frr.conf b/dockers/docker-config-engine-bullseye/00-load-omprog.conf similarity index 100% rename from dockers/docker-fpm-frr/00-frr.conf rename to dockers/docker-config-engine-bullseye/00-load-omprog.conf diff --git a/dockers/docker-config-engine-bullseye/Dockerfile.j2 b/dockers/docker-config-engine-bullseye/Dockerfile.j2 index 700af660a9..4d0345c4b5 100644 --- a/dockers/docker-config-engine-bullseye/Dockerfile.j2 +++ b/dockers/docker-config-engine-bullseye/Dockerfile.j2 @@ -50,6 +50,7 @@ RUN pip3 install redis==4.5.4 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 \ diff --git a/dockers/docker-fpm-frr/Dockerfile.j2 b/dockers/docker-fpm-frr/Dockerfile.j2 index 5a14558c3c..d15fc18462 100644 --- a/dockers/docker-fpm-frr/Dockerfile.j2 +++ b/dockers/docker-fpm-frr/Dockerfile.j2 @@ -54,7 +54,6 @@ COPY ["TSC", "/usr/bin/TSC"] COPY ["TS", "/usr/bin/TS"] COPY ["files/supervisor-proc-exit-listener", "/usr/bin"] COPY ["zsocket.sh", "/usr/bin/"] -COPY ["00-frr.conf", "/etc/rsyslog.d/"] COPY ["*.json", "/etc/rsyslog.d/"] COPY ["files/rsyslog_plugin.conf.j2", "/etc/rsyslog.d/"] RUN chmod a+x /usr/bin/TSA && \