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

[docker-syncd-rpc]: Fix the issue which prevented supervisord to start (#555)

Browse Source 
service syncd start blocks docker-syncd-rpc start.sh script
and supervisord doesn't start. so start supervisor in daemon mode
This commit is contained in:
pavel-shirshov 2017-04-28 22:48:50 -07:00 committed by Shuotian Cheng
parent e2a22407b0
commit 14578d50e2
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2
View File

@ -50,7 +50,7 @@ RUN apt-get update \
COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
COPY ptf_nn_agent.conf /etc/supervisor/conf.d/ptf_nn_agent.conf COPY ptf_nn_agent.conf /etc/supervisor/conf.d/ptf_nn_agent.conf
RUN sed -i 's/read/sysctl -w net.core.rmem_max=509430500 ; \/usr\/bin\/supervisord/' /usr/bin/start.sh RUN sed -i "/service rsyslog start/a sysctl -w net.core.rmem_max=509430500 ; \/usr\/bin\/supervisord" /usr/bin/start.sh
ENTRYPOINT ["/bin/bash"] ENTRYPOINT ["/bin/bash"]
CMD ["/usr/bin/start.sh"] CMD ["/usr/bin/start.sh"]

2
platform/broadcom/docker-syncd-brcm-rpc/supervisord.conf
View File

@ -1,2 +1,2 @@
[supervisord] [supervisord]
nodaemon=true nodaemon=false

2
platform/cavium/docker-syncd-cavm-rpc/Dockerfile.j2
View File

@ -50,7 +50,7 @@ RUN apt-get update \
COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
COPY ptf_nn_agent.conf /etc/supervisor/conf.d/ptf_nn_agent.conf COPY ptf_nn_agent.conf /etc/supervisor/conf.d/ptf_nn_agent.conf
RUN sed -i 's/read/sysctl -w net.core.rmem_max=509430500 ; \/usr\/bin\/supervisord/' /usr/bin/start.sh RUN sed -i "/service rsyslog start/a sysctl -w net.core.rmem_max=509430500 ; \/usr\/bin\/supervisord" /usr/bin/start.sh
ENTRYPOINT ["/bin/bash"] ENTRYPOINT ["/bin/bash"]
CMD ["/usr/bin/start.sh"] CMD ["/usr/bin/start.sh"]

2
platform/cavium/docker-syncd-cavm-rpc/supervisord.conf
View File

@ -1,2 +1,2 @@
[supervisord] [supervisord]
nodaemon=true nodaemon=false

2
platform/centec/docker-syncd-centec-rpc/Dockerfile.j2
View File

@ -50,7 +50,7 @@ RUN apt-get update \
COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
COPY ptf_nn_agent.conf /etc/supervisor/conf.d/ptf_nn_agent.conf COPY ptf_nn_agent.conf /etc/supervisor/conf.d/ptf_nn_agent.conf
RUN sed -i 's/read/sysctl -w net.core.rmem_max=509430500 ; \/usr\/bin\/supervisord/' /usr/bin/start.sh RUN sed -i "/service rsyslog start/a sysctl -w net.core.rmem_max=509430500 ; \/usr\/bin\/supervisord" /usr/bin/start.sh
ENTRYPOINT ["/bin/bash"] ENTRYPOINT ["/bin/bash"]
CMD ["/usr/bin/start.sh"] CMD ["/usr/bin/start.sh"]

2
platform/centec/docker-syncd-centec-rpc/supervisord.conf
View File

@ -1,2 +1,2 @@
[supervisord] [supervisord]
nodaemon=true nodaemon=false

2
platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2
View File

@ -50,7 +50,7 @@ RUN apt-get update \
COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
COPY ptf_nn_agent.conf /etc/supervisor/conf.d/ptf_nn_agent.conf COPY ptf_nn_agent.conf /etc/supervisor/conf.d/ptf_nn_agent.conf
RUN sed -i 's/read/sysctl -w net.core.rmem_max=509430500 ; \/usr\/bin\/supervisord/' /usr/bin/start.sh RUN sed -i "/service rsyslog start/a sysctl -w net.core.rmem_max=509430500 ; \/usr\/bin\/supervisord" /usr/bin/start.sh
ENTRYPOINT ["/bin/bash"] ENTRYPOINT ["/bin/bash"]
CMD ["/usr/bin/start.sh"] CMD ["/usr/bin/start.sh"]

2
platform/mellanox/docker-syncd-mlnx-rpc/supervisord.conf
View File

@ -1,2 +1,2 @@
[supervisord] [supervisord]
nodaemon=true nodaemon=false