Skip to content

Commit 17bab6d

Browse files
Install saithrift by default to ptf container. Install supervisor to docker-ptf. Don't wait until interfaces are active for syncd-rpc containers
1 parent afab1ae commit 17bab6d

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

dockers/docker-ptf/Dockerfile

+5
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ RUN sed --in-place 's/httpredir.debian.org/debian-archive.trafficmanager.net/' /
3939
&& dpkg_apt /root/deps/python-ptf_*.deb \
4040
&& dpkg_apt /root/deps/libthrift-0.9.2_*.deb \
4141
&& dpkg_apt /root/deps/python-thrift_*.deb \
42+
&& cd /root/deps \
43+
&& tar xvfz saithrift-0.9.tar.gz \
44+
&& cd saithrift-0.9 \
45+
&& python setup.py install \
46+
&& cd \
4247
&& rm -rf /root/deps \
4348
&& apt-get -y autoclean \
4449
&& apt-get -y autoremove \

dockers/docker-syncd-mlnx-rpc/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ RUN apt-get update \
1616
python-dev \
1717
wget \
1818
cmake \
19+
supervisor \
1920
&& wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
2021
&& tar xvfz 1.0.0.tar.gz \
2122
&& cd nanomsg-1.0.0 \
@@ -44,5 +45,4 @@ COPY ptf_nn_agent.conf /etc/supervisor/conf.d/ptf_nn_agent.conf
4445

4546
ENTRYPOINT service rsyslog start \
4647
&& service syncd start \
47-
&& while [ "x$( ifconfig Ethernet12 | grep RUNNING )" = 'x' ] ; do sleep 1 ; done \
4848
&& /usr/bin/supervisord

dockers/docker-syncd-rpc/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ RUN apt-get update \
1616
python-dev \
1717
wget \
1818
cmake \
19+
supervisor \
1920
&& wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
2021
&& tar xvfz 1.0.0.tar.gz \
2122
&& cd nanomsg-1.0.0 \
@@ -44,5 +45,4 @@ COPY ptf_nn_agent.conf /etc/supervisor/conf.d/ptf_nn_agent.conf
4445

4546
ENTRYPOINT service rsyslog start \
4647
&& service syncd start \
47-
&& while [ "x$( ifconfig Ethernet12 | grep RUNNING )" = 'x' ] ; do sleep 1 ; done \
4848
&& /usr/bin/supervisord

0 commit comments

Comments
 (0)