Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[docker-fpm-quagga]: Manage Quagga processes (zebra, bgpd) using supervisor instead of watchquagga #900

Merged
merged 1 commit into from
Aug 21, 2017
Merged

[docker-fpm-quagga]: Manage Quagga processes (zebra, bgpd) using supervisor instead of watchquagga #900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions dockers/docker-fpm-quagga/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,8 @@ debs/{{ deb }}{{' '}}
RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
RUN rm -rf /debs

COPY ["start.sh", "/usr/bin/"]
COPY ["bgpcfgd", "/usr/bin/"]
COPY ["bgpcfgd", "start.sh", "/usr/bin/"]
COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
COPY ["*.j2", "/usr/share/sonic/templates/"]
COPY ["daemons", "/etc/quagga/"]

ENTRYPOINT ["/usr/bin/supervisord"]
31 changes: 0 additions & 31 deletions dockers/docker-fpm-quagga/daemons
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions dockers/docker-fpm-quagga/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ supervisorctl start bgpcfgd

supervisorctl start rsyslogd

# Quagga has its own monitor process, 'watchquagga'
service quagga start
# Start Quagga processes
supervisorctl start zebra
supervisorctl start bgpd

supervisorctl start fpmsyncd
27 changes: 21 additions & 6 deletions dockers/docker-fpm-quagga/supervisord.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,42 @@ autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog

[program:rsyslogd]
command=/usr/sbin/rsyslogd -n
[program:bgpcfgd]
command=/usr/bin/bgpcfgd
priority=2
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog

[program:fpmsyncd]
command=fpmsyncd
[program:rsyslogd]
command=/usr/sbin/rsyslogd -n
priority=3
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog

[program:bgpcfgd]
command=/usr/bin/bgpcfgd
[program:zebra]
command=/usr/lib/quagga/zebra -A 127.0.0.1
priority=4
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog

[program:bgpd]
command=/usr/lib/quagga/bgpd -A 127.0.0.1
priority=5
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog

[program:fpmsyncd]
command=fpmsyncd
priority=6
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog