Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[docker-syncd-brcm-rpc]: Fix build #423

Merged
merged 3 commits into from
Mar 22, 2017
Merged

[docker-syncd-brcm-rpc]: Fix build #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4cdbca
Fix docker-syncd-rpc build
pavel-shirshov Mar 22, 2017
f90cd22
Rename docker-syncd-rpc to docker-syncd-brcm-rpc
pavel-shirshov Mar 22, 2017
86735a1
Add fix for mlnx platform too
pavel-shirshov Mar 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions dockers/docker-syncd-rpc/Dockerfile → dockers/docker-syncd-brcm-rpc/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker-syncd
FROM docker-syncd-brcm

## Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive
Expand Down Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we have this change only for brcm but not for mlnx?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably should change the title of the PR to reflect this.


ENTRYPOINT ["/bin/bash"]
CMD ["/usr/bin/start.sh"]
0 dockers/docker-syncd-rpc/ptf_nn_agent.conf → ...s/docker-syncd-brcm-rpc/ptf_nn_agent.conf
View file
Open in desktop
File renamed without changes.
0 dockers/docker-syncd-rpc/supervisord.conf → ...rs/docker-syncd-brcm-rpc/supervisord.conf
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions dockers/docker-syncd-mlnx-rpc/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]