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

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

Browse Source 
* 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
This commit is contained in:
pavel-shirshov 2017-03-22 16:38:51 -07:00 committed by GitHub
parent 42ae02b665
commit 91cca8966d
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dockers/docker-syncd-rpc/Dockerfile → dockers/docker-syncd-brcm-rpc/Dockerfile
View File

@ -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"]

0
dockers/docker-syncd-rpc/ptf_nn_agent.conf → dockers/docker-syncd-brcm-rpc/ptf_nn_agent.conf
View File

0
dockers/docker-syncd-rpc/supervisord.conf → dockers/docker-syncd-brcm-rpc/supervisord.conf
View File

8
dockers/docker-syncd-mlnx-rpc/Dockerfile
View File

@ -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"]