matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Load generic omprog in all dockers for rsyslog plugin support (#16601)

Browse Source 
### 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
This commit is contained in:
Zain Budhwani 2023-09-20 16:27:42 -07:00 committed by GitHub
parent d62ad707bc
commit 2dfdeb94d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
dockers/docker-fpm-frr/00-frr.conf → dockers/docker-config-engine-bullseye/00-load-omprog.conf
View File

1
dockers/docker-config-engine-bullseye/Dockerfile.j2
View File

@ -50,6 +50,7 @@ RUN pip3 install redis==4.5.4
COPY ["files/swss_vars.j2", "/usr/share/sonic/templates/"] COPY ["files/swss_vars.j2", "/usr/share/sonic/templates/"]
COPY ["files/readiness_probe.sh", "/usr/bin/"] COPY ["files/readiness_probe.sh", "/usr/bin/"]
COPY ["files/container_startup.py", "/usr/share/sonic/scripts/"] COPY ["files/container_startup.py", "/usr/share/sonic/scripts/"]
COPY ["00-load-omprog.conf", "/etc/rsyslog.d/"]
## Clean up ## Clean up
RUN apt-get purge -y \ RUN apt-get purge -y \

1
dockers/docker-fpm-frr/Dockerfile.j2
View File

@ -54,7 +54,6 @@ COPY ["TSC", "/usr/bin/TSC"]
COPY ["TS", "/usr/bin/TS"] COPY ["TS", "/usr/bin/TS"]
COPY ["files/supervisor-proc-exit-listener", "/usr/bin"] COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
COPY ["zsocket.sh", "/usr/bin/"] COPY ["zsocket.sh", "/usr/bin/"]
COPY ["00-frr.conf", "/etc/rsyslog.d/"]
COPY ["*.json", "/etc/rsyslog.d/"] COPY ["*.json", "/etc/rsyslog.d/"]
COPY ["files/rsyslog_plugin.conf.j2", "/etc/rsyslog.d/"] COPY ["files/rsyslog_plugin.conf.j2", "/etc/rsyslog.d/"]
RUN chmod a+x /usr/bin/TSA && \ RUN chmod a+x /usr/bin/TSA && \