Add recipe for ptf docker

sonic-net · Jan 5, 2017 · a98d1af · a98d1af
1 parent c19a259
commit a98d1af
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/dockers/docker-ptf/Dockerfile → dockers/docker-ptf/Dockerfile.j2 b/dockers/docker-ptf/Dockerfile → dockers/docker-ptf/Dockerfile.j2
@@ -3,7 +3,7 @@ FROM debian:jessie
 MAINTAINER Pavel Shirshov
 
 ## Copy dependencies
-COPY deps /root/deps
+COPY debs /debs
 
 ## Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
@@ -35,11 +35,15 @@ RUN sed --in-place 's/httpredir.debian.org/debian-archive.trafficmanager.net/' /
         python-dev          \
         wget                \
         cmake               \
-    && dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } \
-    && dpkg_apt /root/deps/python-ptf_*.deb \
-    && dpkg_apt /root/deps/libthrift-0.9.3_*.deb \
-    && dpkg_apt /root/deps/python-thrift_*.deb \
-    && rm -rf /root/deps \
+        libqt5core5a        \
+        libqt5network5
+
+RUN dpkg -i \
+{% for deb in docker_ptf_debs.split(' ') -%}
+debs/{{ deb }}{{' '}}
+{%- endfor %}
+
+RUN rm -rf /debs \
     && apt-get -y autoclean \
     && apt-get -y autoremove \
     && rm -rf /var/lib/apt/lists/* \

diff --git a/rules/docker-ptf.mk b/rules/docker-ptf.mk
@@ -0,0 +1,6 @@
+# docker image for ptf
+
+DOCKER_PTF = docker-ptf.gz
+$(DOCKER_PTF)_PATH = $(DOCKERS_PATH)/docker-ptf
+$(DOCKER_PTF)_DEPENDS += $(LIBTHRIFT) $(PYTHON_THRIFT) $(PTF)
+SONIC_DOCKER_IMAGES += $(DOCKER_PTF)