File tree 3 files changed +7
-6
lines changed
3 files changed +7
-6
lines changed Original file line number Diff line number Diff line change @@ -56,14 +56,14 @@ COPY ["TS", "/usr/bin/TS"]
56
56
COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
57
57
COPY ["zsocket.sh", "/usr/bin/"]
58
58
COPY ["*.json", "/etc/rsyslog.d/"]
59
- COPY ["files/rsyslog_plugin.conf.j2", "/etc/rsyslog.d/"]
59
+ # COPY ["files/rsyslog_plugin.conf.j2", "/etc/rsyslog.d/"]
60
60
RUN chmod a+x /usr/bin/TSA && \
61
61
chmod a+x /usr/bin/TSB && \
62
62
chmod a+x /usr/bin/TSC && \
63
63
chmod a+x /usr/bin/zsocket.sh
64
64
65
- RUN j2 -f json /etc/rsyslog.d/rsyslog_plugin.conf.j2 /etc/rsyslog.d/events_info.json > /etc/rsyslog.d/bgp_events.conf
66
- RUN rm -f /etc/rsyslog.d/rsyslog_plugin.conf.j2*
65
+ # RUN j2 -f json /etc/rsyslog.d/rsyslog_plugin.conf.j2 /etc/rsyslog.d/events_info.json > /etc/rsyslog.d/bgp_events.conf
66
+ # RUN rm -f /etc/rsyslog.d/rsyslog_plugin.conf.j2*
67
67
RUN rm -f /etc/rsyslog.d/events_info.json*
68
68
69
69
ENTRYPOINT ["/usr/bin/docker_init.sh"]
Original file line number Diff line number Diff line change @@ -800,8 +800,8 @@ sudo bash -c "echo { > $FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES/ctr_image_name
800
800
sudo bash -c " echo } >> $FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES /ctr_image_names.json"
801
801
802
802
# copy rsyslog plugin binary for use by all dockers that use plugin to publish events.
803
- sudo mkdir -p ${FILESYSTEM_ROOT_USR_SHARE_SONIC_SCRIPTS}
804
- sudo cp ${files_path} /rsyslog_plugin ${FILESYSTEM_ROOT_USR_SHARE_SONIC_SCRIPTS} /
803
+ # sudo mkdir -p ${FILESYSTEM_ROOT_USR_SHARE_SONIC_SCRIPTS}
804
+ # sudo cp ${files_path}/rsyslog_plugin ${FILESYSTEM_ROOT_USR_SHARE_SONIC_SCRIPTS}/
805
805
806
806
{% for script in installer_start_scripts.split(' ' ) -%}
807
807
if [ -f $TARGET_MACHINE " _{{script}}" ]; then
Original file line number Diff line number Diff line change @@ -43,5 +43,6 @@ $(DOCKER_EVENTD)_PLUGIN = rsyslog_plugin
43
43
$($(DOCKER_EVENTD)_PLUGIN)_PATH = $($(DOCKER_EVENTD ) _FILESPATH)
44
44
45
45
SONIC_COPY_FILES += $($(DOCKER_EVENTD ) _PLUGIN)
46
- $(DOCKER_EVENTD)_SHARED_FILES = $($(DOCKER_EVENTD ) _PLUGIN)
46
+ # Some builds fails to find this file. Remove until we root cause it.
47
+ # $(DOCKER_EVENTD)_SHARED_FILES = $($(DOCKER_EVENTD)_PLUGIN)
47
48
You can’t perform that action at this time.
0 commit comments