Skip to content

Commit a98d1af

Browse files
Add recipe for ptf docker
1 parent c19a259 commit a98d1af

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed

dockers/docker-ptf/Dockerfile renamed to dockers/docker-ptf/Dockerfile.j2

+10-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM debian:jessie
33
MAINTAINER Pavel Shirshov
44

55
## Copy dependencies
6-
COPY deps /root/deps
6+
COPY debs /debs
77

88
## Make apt-get non-interactive
99
ENV DEBIAN_FRONTEND=noninteractive
@@ -35,11 +35,15 @@ RUN sed --in-place 's/httpredir.debian.org/debian-archive.trafficmanager.net/' /
3535
python-dev \
3636
wget \
3737
cmake \
38-
&& dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } \
39-
&& dpkg_apt /root/deps/python-ptf_*.deb \
40-
&& dpkg_apt /root/deps/libthrift-0.9.3_*.deb \
41-
&& dpkg_apt /root/deps/python-thrift_*.deb \
42-
&& rm -rf /root/deps \
38+
libqt5core5a \
39+
libqt5network5
40+
41+
RUN dpkg -i \
42+
{% for deb in docker_ptf_debs.split(' ') -%}
43+
debs/{{ deb }}{{' '}}
44+
{%- endfor %}
45+
46+
RUN rm -rf /debs \
4347
&& apt-get -y autoclean \
4448
&& apt-get -y autoremove \
4549
&& rm -rf /var/lib/apt/lists/* \

rules/docker-ptf.mk

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# docker image for ptf
2+
3+
DOCKER_PTF = docker-ptf.gz
4+
$(DOCKER_PTF)_PATH = $(DOCKERS_PATH)/docker-ptf
5+
$(DOCKER_PTF)_DEPENDS += $(LIBTHRIFT) $(PYTHON_THRIFT) $(PTF)
6+
SONIC_DOCKER_IMAGES += $(DOCKER_PTF)

0 commit comments

Comments
 (0)