[docker-syncd-*-rpc]: Fix build (#423)

* Fix docker-syncd-brcm-rpc build * Fix docker-syncd-mlnx-rpc build * Rename docker-syncd-rpc to docker-syncd-brcm-rpc * Add fix for mlnx platform too
sonic-net · Mar 22, 2017 · 91cca89 · 91cca89
1 parent 42ae02b
commit 91cca89
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/dockers/docker-syncd-rpc/Dockerfile → dockers/docker-syncd-brcm-rpc/Dockerfile b/dockers/docker-syncd-rpc/Dockerfile → dockers/docker-syncd-brcm-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"]
diff --git a/dockers/docker-syncd-rpc/ptf_nn_agent.conf → ...s/docker-syncd-brcm-rpc/ptf_nn_agent.conf b/dockers/docker-syncd-rpc/ptf_nn_agent.conf → ...s/docker-syncd-brcm-rpc/ptf_nn_agent.conf
diff --git a/dockers/docker-syncd-rpc/supervisord.conf → ...rs/docker-syncd-brcm-rpc/supervisord.conf b/dockers/docker-syncd-rpc/supervisord.conf → ...rs/docker-syncd-brcm-rpc/supervisord.conf
diff --git 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"]