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

[docker-syncd-*]: Properly manage syncd with supervisord #617

Merged
merged 3 commits into from
May 24, 2017
Merged

[docker-syncd-*]: Properly manage syncd with supervisord #617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dee62f3
Syncd dockers now are built from docker-config-engine instead of dock…
jleveque May 17, 2017
5a73616
Supervisord in all syncd dockers now call syncd_start.s which is inst…
jleveque May 17, 2017
c5fa0dc
Update sonic-sairedis submodule
jleveque May 20, 2017
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: 2 additions & 2 deletions platform/broadcom/docker-syncd-brcm/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker-base
FROM docker-config-engine

## Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive
Expand All @@ -19,7 +19,7 @@ debs/{{ deb }}{{' '}}
## TODO: add kmod into Depends
RUN apt-get install -f kmod

COPY ["debs/dsserve", "debs/bcmcmd", "start.sh", "syncd.sh", "/usr/bin/"]
COPY ["debs/dsserve", "debs/bcmcmd", "start.sh", "/usr/bin/"]
RUN chmod +x /usr/bin/dsserve /usr/bin/bcmcmd

COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
Expand Down
2 changes: 1 addition & 1 deletion platform/broadcom/docker-syncd-brcm/supervisord.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ stdout_logfile=syslog
stderr_logfile=syslog

[program:syncd]
command=/usr/bin/syncd.sh
command=/usr/bin/syncd_start.sh
priority=3
autostart=false
autorestart=false
Expand Down
12 changes: 0 additions & 12 deletions platform/broadcom/docker-syncd-brcm/syncd.sh
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions platform/cavium/docker-syncd-cavm/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker-base
FROM docker-config-engine

## Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive
Expand All @@ -18,7 +18,7 @@ RUN dpkg -i \
debs/{{ deb }}{{' '}}
{%- endfor %}

COPY ["start.sh", "syncd.sh", "/usr/bin/"]
COPY ["start.sh", "/usr/bin/"]
COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]

COPY ["profile.ini", "/etc/ssw/AS7512/"]
Expand Down
2 changes: 1 addition & 1 deletion platform/cavium/docker-syncd-cavm/supervisord.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ stdout_logfile=syslog
stderr_logfile=syslog

[program:syncd]
command=/usr/bin/syncd.sh
command=/usr/bin/syncd_start.sh
priority=3
autostart=false
autorestart=false
Expand Down
22 changes: 0 additions & 22 deletions platform/cavium/docker-syncd-cavm/syncd.sh
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions platform/centec/docker-syncd-centec/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker-base
FROM docker-config-engine

## Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive
Expand All @@ -19,7 +19,7 @@ debs/{{ deb }}{{' '}}
## TODO: add kmod into Depends
RUN apt-get install -f kmod

COPY ["start.sh", "syncd.sh", "/usr/bin/"]
COPY ["start.sh", "/usr/bin/"]
COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]

## Clean up
Expand Down
2 changes: 1 addition & 1 deletion platform/centec/docker-syncd-centec/supervisord.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ stdout_logfile=syslog
stderr_logfile=syslog

[program:syncd]
command=/usr/bin/syncd.sh
command=/usr/bin/syncd_start.sh
priority=3
autostart=false
autorestart=false
Expand Down
12 changes: 0 additions & 12 deletions platform/centec/docker-syncd-centec/syncd.sh
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions platform/mellanox/docker-syncd-mlnx/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker-base
FROM docker-config-engine

## Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive
Expand All @@ -18,7 +18,7 @@ RUN dpkg -i \
debs/{{ deb }}{{' '}}
{%- endfor %}

COPY ["start.sh", "syncd.sh", "mlnx-fw-upgrade.sh", "/usr/bin/"]
COPY ["start.sh", "mlnx-fw-upgrade.sh", "/usr/bin/"]
COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
COPY ["/debs/fw-SPC.mfa", "/etc/mlnx/"]

Expand Down
5 changes: 4 additions & 1 deletion platform/mellanox/docker-syncd-mlnx/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,8 @@ rm -f /var/run/rsyslogd.pid

supervisorctl start rsyslogd

supervisorctl start syncd
# mlnx-fw-upgrade.sh will exit if firmware was actually upgraded
# or if some error occurs
. mlnx-fw-upgrade.sh

supervisorctl start syncd
2 changes: 1 addition & 1 deletion platform/mellanox/docker-syncd-mlnx/supervisord.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ stdout_logfile=syslog
stderr_logfile=syslog

[program:syncd]
command=/usr/bin/syncd.sh
command=/usr/bin/syncd_start.sh
priority=3
autostart=false
autorestart=false
Expand Down
19 changes: 0 additions & 19 deletions platform/mellanox/docker-syncd-mlnx/syncd.sh
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/sonic-sairedis
Open in desktop
Submodule sonic-sairedis updated from 9fe1e6 to 31131d