Skip to content

Commit 91cca89

Browse files
[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
1 parent 42ae02b commit 91cca89

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

dockers/docker-syncd-rpc/Dockerfile renamed to dockers/docker-syncd-brcm-rpc/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker-syncd
1+
FROM docker-syncd-brcm
22

33
## Make apt-get non-interactive
44
ENV DEBIAN_FRONTEND=noninteractive
@@ -43,7 +43,7 @@ RUN apt-get update \
4343
COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
4444
COPY ptf_nn_agent.conf /etc/supervisor/conf.d/ptf_nn_agent.conf
4545

46-
ENTRYPOINT service rsyslog start \
47-
&& sysctl -w net.core.rmem_max=509430500 \
48-
&& service syncd start \
49-
&& /usr/bin/supervisord
46+
RUN sed -i 's/read/sysctl -w net.core.rmem_max=509430500 ; \/usr\/bin\/supervisord/' /usr/bin/start.sh
47+
48+
ENTRYPOINT ["/bin/bash"]
49+
CMD ["/usr/bin/start.sh"]

dockers/docker-syncd-mlnx-rpc/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ RUN apt-get update \
4343
COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
4444
COPY ptf_nn_agent.conf /etc/supervisor/conf.d/ptf_nn_agent.conf
4545

46-
ENTRYPOINT service rsyslog start \
47-
&& sysctl -w net.core.rmem_max=509430500 \
48-
&& service syncd start \
49-
&& /usr/bin/supervisord
46+
RUN sed -i 's/read/sysctl -w net.core.rmem_max=509430500 ; \/usr\/bin\/supervisord/' /usr/bin/start.sh
47+
48+
ENTRYPOINT ["/bin/bash"]
49+
CMD ["/usr/bin/start.sh"]

0 commit comments

Comments
 (0)