From f4cdbca474f5aece9ab3220f410d0d84d0431b4e Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Wed, 22 Mar 2017 15:27:08 -0700 Subject: [PATCH 1/3] Fix docker-syncd-rpc build --- dockers/docker-syncd-rpc/Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dockers/docker-syncd-rpc/Dockerfile b/dockers/docker-syncd-rpc/Dockerfile index ed75d1a1f0ec..23f5e7a25f6a 100644 --- a/dockers/docker-syncd-rpc/Dockerfile +++ b/dockers/docker-syncd-rpc/Dockerfile @@ -1,4 +1,4 @@ -FROM docker-syncd +FROM docker-syncd-brcm ## Make apt-get non-interactive ENV DEBIAN_FRONTEND=noninteractive @@ -43,7 +43,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 -ENTRYPOINT service rsyslog start \ - && sysctl -w net.core.rmem_max=509430500 \ - && service syncd start \ - && /usr/bin/supervisord +RUN sed -i 's/read/sysctl -w net.core.rmem_max=509430500 ; \/usr\/bin\/supervisord/' /usr/bin/start.sh + +ENTRYPOINT ["/bin/bash"] +CMD ["/usr/bin/start.sh"] From f90cd223f5575169cbb58a4d6cd08d30da477059 Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Wed, 22 Mar 2017 15:27:31 -0700 Subject: [PATCH 2/3] Rename docker-syncd-rpc to docker-syncd-brcm-rpc --- dockers/{docker-syncd-rpc => docker-syncd-brcm-rpc}/Dockerfile | 0 .../{docker-syncd-rpc => docker-syncd-brcm-rpc}/ptf_nn_agent.conf | 0 .../{docker-syncd-rpc => docker-syncd-brcm-rpc}/supervisord.conf | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename dockers/{docker-syncd-rpc => docker-syncd-brcm-rpc}/Dockerfile (100%) rename dockers/{docker-syncd-rpc => docker-syncd-brcm-rpc}/ptf_nn_agent.conf (100%) rename dockers/{docker-syncd-rpc => docker-syncd-brcm-rpc}/supervisord.conf (100%) diff --git a/dockers/docker-syncd-rpc/Dockerfile b/dockers/docker-syncd-brcm-rpc/Dockerfile similarity index 100% rename from dockers/docker-syncd-rpc/Dockerfile rename to dockers/docker-syncd-brcm-rpc/Dockerfile diff --git a/dockers/docker-syncd-rpc/ptf_nn_agent.conf b/dockers/docker-syncd-brcm-rpc/ptf_nn_agent.conf similarity index 100% rename from dockers/docker-syncd-rpc/ptf_nn_agent.conf rename to dockers/docker-syncd-brcm-rpc/ptf_nn_agent.conf diff --git a/dockers/docker-syncd-rpc/supervisord.conf b/dockers/docker-syncd-brcm-rpc/supervisord.conf similarity index 100% rename from dockers/docker-syncd-rpc/supervisord.conf rename to dockers/docker-syncd-brcm-rpc/supervisord.conf From 86735a1548d06603cf56640b0b4fdbaa0d4780c5 Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Wed, 22 Mar 2017 16:35:36 -0700 Subject: [PATCH 3/3] Add fix for mlnx platform too --- dockers/docker-syncd-mlnx-rpc/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dockers/docker-syncd-mlnx-rpc/Dockerfile b/dockers/docker-syncd-mlnx-rpc/Dockerfile index 3b891784b226..42e24be7ecb5 100644 --- a/dockers/docker-syncd-mlnx-rpc/Dockerfile +++ b/dockers/docker-syncd-mlnx-rpc/Dockerfile @@ -43,7 +43,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 -ENTRYPOINT service rsyslog start \ - && sysctl -w net.core.rmem_max=509430500 \ - && service syncd start \ - && /usr/bin/supervisord +RUN sed -i 's/read/sysctl -w net.core.rmem_max=509430500 ; \/usr\/bin\/supervisord/' /usr/bin/start.sh + +ENTRYPOINT ["/bin/bash"] +CMD ["/usr/bin/start.sh"]