From 058237e5811ab0b2d2ffb119228349737dea4a54 Mon Sep 17 00:00:00 2001 From: Filip Tehlar Date: Wed, 11 Jan 2023 10:58:58 +0100 Subject: hs-test: optimize size of docker image Copy necessary only plugins in docker image Type: improvement Signed-off-by: Filip Tehlar Change-Id: I5f60a8a1ccbbe099ac60774562dc5901f3b4fbed --- extras/hs-test/Dockerfile.vpp | 12 +++++++++--- extras/hs-test/utils.go | 12 +++++++----- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/extras/hs-test/Dockerfile.vpp b/extras/hs-test/Dockerfile.vpp index e72c581c142..45b6287cdbd 100644 --- a/extras/hs-test/Dockerfile.vpp +++ b/extras/hs-test/Dockerfile.vpp @@ -6,9 +6,15 @@ RUN apt-get update \ vim gdb \ && rm -rf /var/lib/apt/lists/* -COPY vpp-data/lib/vat2_plugins/ /usr/lib/vat2_plugins/ -COPY vpp-data/lib/vpp_api_test_plugins/ /usr/lib/vpp_api_test_plugins/ -COPY vpp-data/lib/vpp_plugins/ /usr/lib/x86_64-linux-gnu/vpp_plugins/ +ENV DIR=vpp-data/lib/vpp_plugins +COPY \ + $DIR/af_packet_plugin.so \ + $DIR/hs_apps_plugin.so \ + $DIR/http_plugin.so \ + $DIR/unittest_plugin.so \ + $DIR/quic_plugin.so \ + /usr/lib/x86_64-linux-gnu/vpp_plugins/ + COPY vpp-data/bin/* /usr/bin/ COPY vpp-data/lib/* /usr/lib/ diff --git a/extras/hs-test/utils.go b/extras/hs-test/utils.go index e23ea814269..f3b7ffa7578 100644 --- a/extras/hs-test/utils.go +++ b/extras/hs-test/utils.go @@ -39,11 +39,13 @@ statseg { } plugins { - plugin unittest_plugin.so { enable } - plugin dpdk_plugin.so { disable } - plugin crypto_aesni_plugin.so { enable } - plugin quic_plugin.so { enable } - plugin crypto_ipsecmb_plugin.so { disable } + plugin default { disable } + + plugin unittest_plugin.so { enable } + plugin quic_plugin.so { enable } + plugin af_packet_plugin.so { enable } + plugin hs_apps_plugin.so { enable } + plugin http_plugin.so { enable } } ` -- cgit 1.2.3-korg