On 3/15/23 07:29, Ales Musil wrote:
> Add missing jemalloc, kmod and scapy packages.
> Install scapy through pip, because the
> python3-scapy package has a lot of dependencies
> that would increase the overall size of the image
> by ~800 MB.
> 
> Signed-off-by: Ales Musil <amu...@redhat.com>
> ---
>  utilities/containers/fedora/Dockerfile   | 2 ++
>  utilities/containers/py-requirements.txt | 1 +
>  2 files changed, 3 insertions(+)
> 
> diff --git a/utilities/containers/fedora/Dockerfile 
> b/utilities/containers/fedora/Dockerfile
> index be8cd6ff2..d24bf1232 100755
> --- a/utilities/containers/fedora/Dockerfile
> +++ b/utilities/containers/fedora/Dockerfile
> @@ -19,7 +19,9 @@ RUN dnf -y update \
>          iproute \
>          iproute-tc \
>          iputils \
> +        jemalloc-devel \
>          kernel-devel \
> +        kmod \
>          libcap-ng-devel \
>          libtool \
>          net-tools \

I think it might be better to follow the official installation procedure
and instead of doing this do something like:

https://github.com/ovn-org/ovn/blob/1bec9e3ddd8500793b52e11c3dc1f41ef1f48591/.ci/ovn-kubernetes/Dockerfile#L19

RUN sed -e 's/@VERSION@/0.0.1/' rhel/openvswitch-fedora.spec.in > /tmp/ovs.spec
RUN dnf builddep -y /tmp/ovs.spec

https://github.com/ovn-org/ovn/blob/1bec9e3ddd8500793b52e11c3dc1f41ef1f48591/.ci/ovn-kubernetes/Dockerfile#L28

RUN sed -e 's/@VERSION@/0.0.1/' rhel/ovn-fedora.spec.in > /tmp/ovn.spec
RUN dnf builddep -y /tmp/ovn.spec

There's still the risk that a new dependency is added and the new image
hasn't been built/pushed yet.  How do you think it's best to address
that?

> diff --git a/utilities/containers/py-requirements.txt 
> b/utilities/containers/py-requirements.txt
> index d7bd21e0d..0d90765c9 100644
> --- a/utilities/containers/py-requirements.txt
> +++ b/utilities/containers/py-requirements.txt
> @@ -1,5 +1,6 @@
>  flake8
>  hacking>=3.0
> +scapy
>  sphinx
>  setuptools
>  pyelftools

_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to