-
Notifications
You must be signed in to change notification settings - Fork 1.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[docker-ptf]replace ping utility from inetutils-ping to iputils-ping #523
[docker-ptf]replace ping utility from inetutils-ping to iputils-ping #523
Conversation
dockers/docker-ptf/Dockerfile.j2
Outdated
@@ -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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
two dpkg -i ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sharp eye, thank you!
dockers/docker-ptf/Dockerfile.j2
Outdated
@@ -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 iputils-ping_20150815-2ubuntu3_amd64.deb |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why not use apt-get iptuils-ping
dockers/docker-ptf/Dockerfile.j2
Outdated
libqt5network5 | ||
libqt5network5 \ | ||
&& dpkg -r inetutils-ping \ | ||
&& apt-get install -y iputils-ping |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Now that we're squashing dockers, this would be cleaner if broken out into a separate RUN dpkg -r inetutils-ping
statement. Thoughts?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we can do dpkg -r inetutils-ping before line 15, and then attach iptuils-ping here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thank you for the recommandation
@@ -40,7 +40,9 @@ RUN sed --in-place 's/httpredir.debian.org/debian-archive.trafficmanager.net/' / | |||
wget \ | |||
cmake \ | |||
libqt5core5a \ | |||
libqt5network5 | |||
libqt5network5 \ | |||
iputils-ping |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
so it will replace the old one?
I locally built the docker image and loaded and start in my local docker machine. Look like it was building correctly with the new package. root@85d6dcf4b6f4:/# dpkg -l | grep ping My local machine ping package is: |
thanks |
* Allocate buffer for 256 entries for ACL resource query * Changed to MACRO
> Add a new field for FLEX_COUNTER_TABLE to indicate delay for flex counters (sonic-net#523) > [logger] Make map access thread safe and proper terminate thread (sonic-net#510) > Test with coverage output, publish gcov on Azure pipelines (sonic-net#517) > Update schema.h to include config_db DHCP and state_db counter table (sonic-net#521) > [schema] Add next hop group table to schema (sonic-net#475) > Fix: DBInterface::get() return nullable strings (sonic-net#516) > [netlink]refill netlink cache when failing to get the link object by name. (sonic-net#506) > Fix test_ConfigDBSubscribe timing risk (sonic-net#512) > added missing headers for building with gcc-10.3 (sonic-net#494) > Modify the hardcode separator ":" to variable. (sonic-net#473)
508202b 2021-08-24 Add a new field for FLEX_COUNTER_TABLE to indicate delay for flex counters (#523) 9fd7dbf 2021-08-20 [logger] Make map access thread safe and proper terminate thread (#510) e4c3d0b 2021-08-20 Test with coverage output, publish gcov on Azure pipelines (#517) ef21bec 2021-08-18 Update schema.h to include config_db DHCP and state_db counter table (#521) 4e4eb9d 2021-08-19 [schema] Add next hop group table to schema (#475) Signed-off-by: Shlomi Bitton <shlomibi@nvidia.com>
sonic-swss 73f6f68 [Flex Counters] Delay flex counters even if tables are present in the DB (#1877) 5edb9e5 [buffer orch] Bugfix: Don't query counter SAI_BUFFER_POOL_STAT_XOFF_ROOM_WATERMARK_BYTES on a pool where it is not supported (#1857) fce0c60 [crm] Fix for Issue #8036 (#1829) sonic-utilities 2630ac1 [Fast-reboot] Set flex counters delay indicator to prevent flex counters enablement after fast-reboot (#1768) 606f1b1 [portstat pfcstat] Unify the packet number format in the output of portstat and pfcstat in all cases (#1755) 2c6a15e [ecnconfig] Fix exception seen during display and add unit tests (#1784) 9b1995e Fix logic in RIF counters print (#1732) sonic-swss-comon 3e7b81f Add a new field for FLEX_COUNTER_TABLE to indicate delay for flex counters (#523)
the inetutils-ping does not have source interface '-I' option