Skip to content

Commit 2dfdeb9

Browse files
authored
Load generic omprog in all dockers for rsyslog plugin support (#16601)
### Why I did it ##### Work item tracking - Microsoft ADO **(number only)**:13366345 #### How I did it Add generic omprog file in all dockers for rsyslog plugin support. Add file to docker-config-engine-bullseye so no need to add individually. #### How to verify it UT/Pipeline
1 parent d62ad70 commit 2dfdeb9

File tree

3 files changed

+1
-1
lines changed

3 files changed

+1
-1
lines changed

dockers/docker-config-engine-bullseye/Dockerfile.j2

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ RUN pip3 install redis==4.5.4
5050
COPY ["files/swss_vars.j2", "/usr/share/sonic/templates/"]
5151
COPY ["files/readiness_probe.sh", "/usr/bin/"]
5252
COPY ["files/container_startup.py", "/usr/share/sonic/scripts/"]
53+
COPY ["00-load-omprog.conf", "/etc/rsyslog.d/"]
5354

5455
## Clean up
5556
RUN apt-get purge -y \

dockers/docker-fpm-frr/Dockerfile.j2

-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ COPY ["TSC", "/usr/bin/TSC"]
5454
COPY ["TS", "/usr/bin/TS"]
5555
COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
5656
COPY ["zsocket.sh", "/usr/bin/"]
57-
COPY ["00-frr.conf", "/etc/rsyslog.d/"]
5857
COPY ["*.json", "/etc/rsyslog.d/"]
5958
COPY ["files/rsyslog_plugin.conf.j2", "/etc/rsyslog.d/"]
6059
RUN chmod a+x /usr/bin/TSA && \

0 commit comments

Comments
 (0)