File tree 2 files changed +16
-6
lines changed
2 files changed +16
-6
lines changed Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ FROM debian:jessie
3
3
MAINTAINER Pavel Shirshov
4
4
5
5
## Copy dependencies
6
- COPY deps /root/deps
6
+ COPY debs /debs
7
7
8
8
## Make apt-get non-interactive
9
9
ENV DEBIAN_FRONTEND=noninteractive
@@ -35,11 +35,15 @@ RUN sed --in-place 's/httpredir.debian.org/debian-archive.trafficmanager.net/' /
35
35
python-dev \
36
36
wget \
37
37
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 \
43
47
&& apt-get -y autoclean \
44
48
&& apt-get -y autoremove \
45
49
&& rm -rf /var/lib/apt/lists/* \
Original file line number Diff line number Diff line change
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 )
You can’t perform that action at this time.
0 commit comments