From 14578d50e24f742a86a99a89c1070c0ec83a3cc7 Mon Sep 17 00:00:00 2001 From: pavel-shirshov Date: Fri, 28 Apr 2017 22:48:50 -0700 Subject: [PATCH] [docker-syncd-rpc]: Fix the issue which prevented supervisord to start (#555) service syncd start blocks docker-syncd-rpc start.sh script and supervisord doesn't start. so start supervisor in daemon mode --- platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2 | 2 +- platform/broadcom/docker-syncd-brcm-rpc/supervisord.conf | 2 +- platform/cavium/docker-syncd-cavm-rpc/Dockerfile.j2 | 2 +- platform/cavium/docker-syncd-cavm-rpc/supervisord.conf | 2 +- platform/centec/docker-syncd-centec-rpc/Dockerfile.j2 | 2 +- platform/centec/docker-syncd-centec-rpc/supervisord.conf | 2 +- platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2 | 2 +- platform/mellanox/docker-syncd-mlnx-rpc/supervisord.conf | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2 b/platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2 index c709202747..cc7c756f80 100644 --- a/platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2 +++ b/platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2 @@ -50,7 +50,7 @@ RUN apt-get update \ COPY supervisord.conf /etc/supervisor/conf.d/supervisord.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"] CMD ["/usr/bin/start.sh"] diff --git a/platform/broadcom/docker-syncd-brcm-rpc/supervisord.conf b/platform/broadcom/docker-syncd-brcm-rpc/supervisord.conf index 54296b8b25..daf9de259d 100644 --- a/platform/broadcom/docker-syncd-brcm-rpc/supervisord.conf +++ b/platform/broadcom/docker-syncd-brcm-rpc/supervisord.conf @@ -1,2 +1,2 @@ [supervisord] -nodaemon=true +nodaemon=false diff --git a/platform/cavium/docker-syncd-cavm-rpc/Dockerfile.j2 b/platform/cavium/docker-syncd-cavm-rpc/Dockerfile.j2 index 1df6dc7802..2688e37833 100644 --- a/platform/cavium/docker-syncd-cavm-rpc/Dockerfile.j2 +++ b/platform/cavium/docker-syncd-cavm-rpc/Dockerfile.j2 @@ -50,7 +50,7 @@ RUN apt-get update \ COPY supervisord.conf /etc/supervisor/conf.d/supervisord.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"] CMD ["/usr/bin/start.sh"] diff --git a/platform/cavium/docker-syncd-cavm-rpc/supervisord.conf b/platform/cavium/docker-syncd-cavm-rpc/supervisord.conf index 54296b8b25..daf9de259d 100644 --- a/platform/cavium/docker-syncd-cavm-rpc/supervisord.conf +++ b/platform/cavium/docker-syncd-cavm-rpc/supervisord.conf @@ -1,2 +1,2 @@ [supervisord] -nodaemon=true +nodaemon=false diff --git a/platform/centec/docker-syncd-centec-rpc/Dockerfile.j2 b/platform/centec/docker-syncd-centec-rpc/Dockerfile.j2 index a0384c14f5..2199e85d85 100644 --- a/platform/centec/docker-syncd-centec-rpc/Dockerfile.j2 +++ b/platform/centec/docker-syncd-centec-rpc/Dockerfile.j2 @@ -50,7 +50,7 @@ RUN apt-get update \ COPY supervisord.conf /etc/supervisor/conf.d/supervisord.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"] CMD ["/usr/bin/start.sh"] diff --git a/platform/centec/docker-syncd-centec-rpc/supervisord.conf b/platform/centec/docker-syncd-centec-rpc/supervisord.conf index 54296b8b25..daf9de259d 100644 --- a/platform/centec/docker-syncd-centec-rpc/supervisord.conf +++ b/platform/centec/docker-syncd-centec-rpc/supervisord.conf @@ -1,2 +1,2 @@ [supervisord] -nodaemon=true +nodaemon=false diff --git a/platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2 b/platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2 index c8b312b1c6..3a4b4784ba 100644 --- a/platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2 +++ b/platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2 @@ -50,7 +50,7 @@ RUN apt-get update \ COPY supervisord.conf /etc/supervisor/conf.d/supervisord.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"] CMD ["/usr/bin/start.sh"] diff --git a/platform/mellanox/docker-syncd-mlnx-rpc/supervisord.conf b/platform/mellanox/docker-syncd-mlnx-rpc/supervisord.conf index 54296b8b25..daf9de259d 100644 --- a/platform/mellanox/docker-syncd-mlnx-rpc/supervisord.conf +++ b/platform/mellanox/docker-syncd-mlnx-rpc/supervisord.conf @@ -1,2 +1,2 @@ [supervisord] -nodaemon=true +nodaemon=false