From f451276cd85f81c9445f483dbbaab29dbb4b9c5d Mon Sep 17 00:00:00 2001 From: REDMONDmasun Date: Thu, 20 Apr 2017 21:01:13 +0000 Subject: [PATCH 1/4] replace ping utility from inetutil-ping to iputils-ping --- dockers/docker-ptf/Dockerfile.j2 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dockers/docker-ptf/Dockerfile.j2 b/dockers/docker-ptf/Dockerfile.j2 index 3f2f1cad8276..ca4aa9183eb0 100644 --- a/dockers/docker-ptf/Dockerfile.j2 +++ b/dockers/docker-ptf/Dockerfile.j2 @@ -70,6 +70,9 @@ RUN rm -rf /debs \ && mkdir -p /opt \ && cd /opt \ && wget https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py + && wget https://launchpadlibrarian.net/265451319/iputils-ping_20150815-2ubuntu3_amd64.deb + && dpkg -r inetutils-ping + && dpkg -i dpkg -i iputils-ping_20150815-2ubuntu3_amd64.deb ## Adjust sshd settings RUN mkdir /var/run/sshd \ From 91abe70bcfa8ee5770ef028301f2cfa29efd8006 Mon Sep 17 00:00:00 2001 From: REDMONDmasun Date: Thu, 20 Apr 2017 21:21:39 +0000 Subject: [PATCH 2/4] fix dup typo --- dockers/docker-ptf/Dockerfile.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockers/docker-ptf/Dockerfile.j2 b/dockers/docker-ptf/Dockerfile.j2 index ca4aa9183eb0..0e8501dbc316 100644 --- a/dockers/docker-ptf/Dockerfile.j2 +++ b/dockers/docker-ptf/Dockerfile.j2 @@ -72,7 +72,7 @@ RUN rm -rf /debs \ && wget https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py && wget https://launchpadlibrarian.net/265451319/iputils-ping_20150815-2ubuntu3_amd64.deb && dpkg -r inetutils-ping - && dpkg -i dpkg -i iputils-ping_20150815-2ubuntu3_amd64.deb + && dpkg -i iputils-ping_20150815-2ubuntu3_amd64.deb ## Adjust sshd settings RUN mkdir /var/run/sshd \ From c1128d102451e1dabbde9dcffc79c61f75c2caff Mon Sep 17 00:00:00 2001 From: Maggie Sun Date: Fri, 28 Apr 2017 02:17:10 +0000 Subject: [PATCH 3/4] change from package installing to using apt install --- dockers/docker-ptf/Dockerfile.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dockers/docker-ptf/Dockerfile.j2 b/dockers/docker-ptf/Dockerfile.j2 index 0e8501dbc316..b621c9320933 100644 --- a/dockers/docker-ptf/Dockerfile.j2 +++ b/dockers/docker-ptf/Dockerfile.j2 @@ -40,7 +40,10 @@ RUN sed --in-place 's/httpredir.debian.org/debian-archive.trafficmanager.net/' / wget \ cmake \ libqt5core5a \ - libqt5network5 + libqt5network5 \ + && dpkg -r inetutils-ping \ + && apt-get install -y iputils-ping + RUN dpkg -i \ {% for deb in docker_ptf_debs.split(' ') -%} @@ -70,9 +73,6 @@ RUN rm -rf /debs \ && mkdir -p /opt \ && cd /opt \ && wget https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py - && wget https://launchpadlibrarian.net/265451319/iputils-ping_20150815-2ubuntu3_amd64.deb - && dpkg -r inetutils-ping - && dpkg -i iputils-ping_20150815-2ubuntu3_amd64.deb ## Adjust sshd settings RUN mkdir /var/run/sshd \ From 42ea13ff81d8c1969e44931fe6fb8927c5faf84d Mon Sep 17 00:00:00 2001 From: Maggie Sun Date: Mon, 1 May 2017 18:17:16 +0000 Subject: [PATCH 4/4] remove unnecessary package handling line --- dockers/docker-ptf/Dockerfile.j2 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dockers/docker-ptf/Dockerfile.j2 b/dockers/docker-ptf/Dockerfile.j2 index b621c9320933..e2e93bcc3dc6 100644 --- a/dockers/docker-ptf/Dockerfile.j2 +++ b/dockers/docker-ptf/Dockerfile.j2 @@ -41,8 +41,7 @@ RUN sed --in-place 's/httpredir.debian.org/debian-archive.trafficmanager.net/' / cmake \ libqt5core5a \ libqt5network5 \ - && dpkg -r inetutils-ping \ - && apt-get install -y iputils-ping + iputils-ping RUN dpkg -i \