On Mon, Jul 28, 2025 at 5:05 PM Ginwala, Aliasgar <aginw...@ebay.com> wrote:
> Thanks.
>
>
>
> Acked-by: Aliasgar Ginwala <aginw...@ebay.com>
>
>
>
>
>
>
>
> *From: *Ales Musil <amu...@redhat.com>
> *Date: *Monday, July 28, 2025 at 00:56
> *To: *d...@openvswitch.org <d...@openvswitch.org>
> *Cc: *dce...@redhat.com <dce...@redhat.com>, Ginwala, Aliasgar <
> aginw...@ebay.com>, mmich...@redhat.com <mmich...@redhat.com>, Ales Musil
> <amu...@redhat.com>
> *Subject: *[PATCH ovn] utilities: Remove the docker directory.
>
> External Email
>
> The docker directory seems to be unmaintained for a while. The last
> update happened in 2020 with one exception in 2024 [0]. As stated in
> the commit:
>
> "Most of the steps were inaccurate. Instead, use latest Ubuntu, use
> OVS from the submodule inside the OVN repo."
>
> Which indicates that the tooling wasn't used for a while, remove
> it completely as there are other ways how to set up ovn inside
> container.
>
> [0] Fixes: 77a24fc1f867 ("utilities/docker: Fix up container build.")
> Signed-off-by: Ales Musil <amu...@redhat.com>
> ---
> utilities/automake.mk | 12 +---
> utilities/docker/Makefile | 20 ------
> utilities/docker/debian/Dockerfile | 20 ------
> utilities/docker/debian/build.sh | 35 ---------
> utilities/docker/install_ovn.sh | 37 ----------
> utilities/docker/ovn_default_nb_port | 1 -
> utilities/docker/ovn_default_northd_host | 1 -
> utilities/docker/ovn_default_sb_port | 1 -
> utilities/docker/rhel/Dockerfile | 20 ------
> utilities/docker/rhel/build.sh | 37 ----------
> utilities/docker/start-ovn | 91 ------------------------
> 11 files changed, 1 insertion(+), 274 deletions(-)
> delete mode 100644 utilities/docker/Makefile
> delete mode 100644 utilities/docker/debian/Dockerfile
> delete mode 100755 utilities/docker/debian/build.sh
> delete mode 100755 utilities/docker/install_ovn.sh
> delete mode 100644 utilities/docker/ovn_default_nb_port
> delete mode 100644 utilities/docker/ovn_default_northd_host
> delete mode 100644 utilities/docker/ovn_default_sb_port
> delete mode 100755 utilities/docker/rhel/Dockerfile
> delete mode 100755 utilities/docker/rhel/build.sh
> delete mode 100755 utilities/docker/start-ovn
>
> diff --git a/utilities/automake.mk b/utilities/automake.mk
> index 03e9096fa..1de33614f 100644
> --- a/utilities/automake.mk
> +++ b/utilities/automake.mk
> @@ -44,17 +44,7 @@ EXTRA_DIST += \
> utilities/containers/py-requirements.txt \
> utilities/containers/prepare.sh \
> utilities/containers/fedora/Dockerfile \
> - utilities/containers/ubuntu/Dockerfile \
> - utilities/docker/Makefile \
> - utilities/docker/start-ovn \
> - utilities/docker/ovn_default_nb_port \
> - utilities/docker/ovn_default_sb_port \
> - utilities/docker/ovn_default_northd_host \
> - utilities/docker/debian/Dockerfile \
> - utilities/docker/debian/build.sh \
> - utilities/docker/rhel/Dockerfile \
> - utilities/docker/rhel/build.sh \
> - utilities/docker/install_ovn.sh
> + utilities/containers/ubuntu/Dockerfile
>
> CLEANFILES += \
> utilities/ovn-ctl.8 \
> diff --git a/utilities/docker/Makefile b/utilities/docker/Makefile
> deleted file mode 100644
> index aad9c3482..000000000
> --- a/utilities/docker/Makefile
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -#export OVN_BRANCH=main
> -#export OVN_VERSION=24.03.90
> -#export DISTRO=debian
> -#export GITHUB_SRC=
> https://nam10.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fovn-org%2Fovn.git&data=05%7C02%7Caginwala%40ebay.com%7Cba724190958345e35d8908ddcdac2fad%7C46326bff992841a0baca17c16c94ea99%7C0%7C0%7C638892861631386166%7CUnknown%7CTWFpbGZsb3d8eyJFbXB0eU1hcGkiOnRydWUsIlYiOiIwLjAuMDAwMCIsIlAiOiJXaW4zMiIsIkFOIjoiTWFpbCIsIldUIjoyfQ%3D%3D%7C0%7C%7C%7C&sdata=ybkoWE7LfUHPhK80VYOVZwJrH16P7iE%2BYWHSuz0qqw8%3D&reserved=0
> -#export DOCKER_REPO=ovn-org/ovn
> -
> -# Example:
> -# make build
> -# make push
> -
> -REPO = ${DOCKER_REPO}
> -tag = ${OVN_VERSION}_${DISTRO}_${OVN_BRANCH}
> -
> -build: ;docker build -t ${REPO}:${tag} --build-arg DISTRO=${DISTRO} \
> ---build-arg OVN_BRANCH=${OVN_BRANCH} \
> ---build-arg GITHUB_SRC=${GITHUB_SRC} -f ${DISTRO}/Dockerfile .
> -
> -.PHONY: build
> -
> -push: ;docker push ${REPO}:${tag}
> diff --git a/utilities/docker/debian/Dockerfile
> b/utilities/docker/debian/Dockerfile
> deleted file mode 100644
> index a89ef46c9..000000000
> --- a/utilities/docker/debian/Dockerfile
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -FROM ubuntu:22.04
> -MAINTAINER "Aliasgar Ginwala" <aginw...@ebay.com>
> -
> -ARG OVN_BRANCH
> -ARG GITHUB_SRC
> -ARG DISTRO
> -
> -copy $DISTRO/build.sh /build.sh
> -copy install_ovn.sh /install_ovn.sh
> -RUN /build.sh $OVN_BRANCH $GITHUB_SRC
> -
> -COPY ovn_default_nb_port /etc/ovn/ovn_default_nb_port
> -COPY ovn_default_sb_port /etc/ovn/ovn_default_sb_port
> -COPY ovn_default_northd_host /etc/ovn/ovn_default_northd_host
> -
> -COPY start-ovn /bin/start-ovn
> -VOLUME ["/var/log/openvswitch", \
> -"/var/lib/openvswitch", "/var/run/openvswitch", "/etc/openvswitch", \
> -"/var/log/ovn", "/var/lib/ovn", "/var/run/ovn", "/etc/ovn"]
> -ENTRYPOINT ["start-ovn"]
> diff --git a/utilities/docker/debian/build.sh
> b/utilities/docker/debian/build.sh
> deleted file mode 100755
> index 6edb5b85e..000000000
> --- a/utilities/docker/debian/build.sh
> +++ /dev/null
> @@ -1,35 +0,0 @@
> -#!/bin/sh
> -#
> -# Licensed under the Apache License, Version 2.0 (the "License");
> -# you may not use this file except in compliance with the License.
> -# You may obtain a copy of the License at:
> -#
> -#
> https://nam10.safelinks.protection.outlook.com/?url=http%3A%2F%2Fwww.apache.org%2Flicenses%2FLICENSE-2.0&data=05%7C02%7Caginwala%40ebay.com%7Cba724190958345e35d8908ddcdac2fad%7C46326bff992841a0baca17c16c94ea99%7C0%7C0%7C638892861631403084%7CUnknown%7CTWFpbGZsb3d8eyJFbXB0eU1hcGkiOnRydWUsIlYiOiIwLjAuMDAwMCIsIlAiOiJXaW4zMiIsIkFOIjoiTWFpbCIsIldUIjoyfQ%3D%3D%7C0%7C%7C%7C&sdata=0r2kxzU8dgOP%2ByEdxTts0OT4LaOxTQ8lkLJsrVgVGWI%3D&reserved=0
> <http://www.apache.org/licenses/LICENSE-2.0>
> -#
> -# Unless required by applicable law or agreed to in writing, software
> -# distributed under the License is distributed on an "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> -# See the License for the specific language governing permissions and
> -# limitations under the License.
> -
> -set -e
> -
> -OVN_BRANCH=$1
> -GITHUB_SRC=$2
> -
> -# Install deps
> -build_deps="apt-utils libelf-dev build-essential libssl-dev python3 \
> -wget gdb autoconf libtool git automake bzip2 debhelper \
> -dh-autoreconf openssl"
> -
> -apt-get update
> -apt-get install -y ${build_deps}
> -
> -./install_ovn.sh $OVN_BRANCH $GITHUB_SRC
> -
> -# remove deps to make the container light weight.
> -apt-get remove --purge -y ${build_deps}
> -apt-get autoremove -y --purge
> -cd ..; rm -rf ovn; rm -rf ovs
> -basic_utils="vim kmod net-tools uuid-runtime iproute2"
> -apt-get install -y ${basic_utils}
> diff --git a/utilities/docker/install_ovn.sh
> b/utilities/docker/install_ovn.sh
> deleted file mode 100755
> index 5157da149..000000000
> --- a/utilities/docker/install_ovn.sh
> +++ /dev/null
> @@ -1,37 +0,0 @@
> -#!/bin/sh
> -#
> -# Licensed under the Apache License, Version 2.0 (the "License");
> -# you may not use this file except in compliance with the License.
> -# You may obtain a copy of the License at:
> -#
> -#
> https://nam10.safelinks.protection.outlook.com/?url=http%3A%2F%2Fwww.apache.org%2Flicenses%2FLICENSE-2.0&data=05%7C02%7Caginwala%40ebay.com%7Cba724190958345e35d8908ddcdac2fad%7C46326bff992841a0baca17c16c94ea99%7C0%7C0%7C638892861631411867%7CUnknown%7CTWFpbGZsb3d8eyJFbXB0eU1hcGkiOnRydWUsIlYiOiIwLjAuMDAwMCIsIlAiOiJXaW4zMiIsIkFOIjoiTWFpbCIsIldUIjoyfQ%3D%3D%7C0%7C%7C%7C&sdata=EWqs7%2Ffo4Vgz06tJJ%2FsyekwNrPvMoAzb%2Bqmw3BFeEak%3D&reserved=0
> <http://www.apache.org/licenses/LICENSE-2.0>
> -#
> -# Unless required by applicable law or agreed to in writing, software
> -# distributed under the License is distributed on an "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> -# See the License for the specific language governing permissions and
> -# limitations under the License.
> -
> -set -e
> -
> -OVN_BRANCH=$1
> -GITHUB_SRC=$2
> -
> -# Get ovn source.
> -git clone --depth 1 -b $OVN_BRANCH $GITHUB_SRC
> -cd ovn
> -
> -# Get OVS submodule, build and install OVS.
> -git submodule update --init
> -cd ovs
> -./boot.sh
> -./configure --localstatedir="/var" --sysconfdir="/etc" --prefix="/usr" \
> ---enable-ssl
> -make -j8 install
> -cd ..
> -
> -# Build and install OVN.
> -./boot.sh
> -./configure --localstatedir="/var" --sysconfdir="/etc" --prefix="/usr" \
> ---enable-ssl
> -make -j8 install
> diff --git a/utilities/docker/ovn_default_nb_port
> b/utilities/docker/ovn_default_nb_port
> deleted file mode 100644
> index d83211678..000000000
> --- a/utilities/docker/ovn_default_nb_port
> +++ /dev/null
> @@ -1 +0,0 @@
> -nb_db_port=6641
> diff --git a/utilities/docker/ovn_default_northd_host
> b/utilities/docker/ovn_default_northd_host
> deleted file mode 100644
> index 55d4ab7aa..000000000
> --- a/utilities/docker/ovn_default_northd_host
> +++ /dev/null
> @@ -1 +0,0 @@
> -northd_host=127.0.0.1
> diff --git a/utilities/docker/ovn_default_sb_port
> b/utilities/docker/ovn_default_sb_port
> deleted file mode 100644
> index 4c9e3f585..000000000
> --- a/utilities/docker/ovn_default_sb_port
> +++ /dev/null
> @@ -1 +0,0 @@
> -sb_db_port=6642
> diff --git a/utilities/docker/rhel/Dockerfile
> b/utilities/docker/rhel/Dockerfile
> deleted file mode 100755
> index e4f5cfece..000000000
> --- a/utilities/docker/rhel/Dockerfile
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -FROM centos:7
> -MAINTAINER "Aliasgar Ginwala" <aginw...@ebay.com>
> -
> -ARG OVN_BRANCH
> -ARG GITHUB_SRC
> -ARG DISTRO
> -
> -copy $DISTRO/build.sh /build.sh
> -copy install_ovn.sh /install_ovn.sh
> -RUN /build.sh $OVN_BRANCH $GITHUB_SRC
> -
> -COPY ovn_default_nb_port /etc/ovn/ovn_default_nb_port
> -COPY ovn_default_sb_port /etc/ovn/ovn_default_sb_port
> -COPY ovn_default_northd_host /etc/ovn/ovn_default_northd_host
> -
> -COPY start-ovn /bin/start-ovn
> -VOLUME ["/var/log/openvswitch", \
> -"/var/lib/openvswitch", "/var/run/openvswitch", "/etc/openvswitch", \
> -"/var/log/ovn", "/var/lib/ovn", "/var/run/ovn", "/etc/ovn"]
> -ENTRYPOINT ["start-ovn"]
> diff --git a/utilities/docker/rhel/build.sh
> b/utilities/docker/rhel/build.sh
> deleted file mode 100755
> index c340820f5..000000000
> --- a/utilities/docker/rhel/build.sh
> +++ /dev/null
> @@ -1,37 +0,0 @@
> -#!/bin/sh
> -#
> -# Licensed under the Apache License, Version 2.0 (the "License");
> -# you may not use this file except in compliance with the License.
> -# You may obtain a copy of the License at:
> -#
> -#
> https://nam10.safelinks.protection.outlook.com/?url=http%3A%2F%2Fwww.apache.org%2Flicenses%2FLICENSE-2.0&data=05%7C02%7Caginwala%40ebay.com%7Cba724190958345e35d8908ddcdac2fad%7C46326bff992841a0baca17c16c94ea99%7C0%7C0%7C638892861631420601%7CUnknown%7CTWFpbGZsb3d8eyJFbXB0eU1hcGkiOnRydWUsIlYiOiIwLjAuMDAwMCIsIlAiOiJXaW4zMiIsIkFOIjoiTWFpbCIsIldUIjoyfQ%3D%3D%7C0%7C%7C%7C&sdata=K%2Fo5Gpp7MQGSz%2FkqZTA%2FW7tUnfmIwkxnznZEdI8DnyE%3D&reserved=0
> <http://www.apache.org/licenses/LICENSE-2.0>
> -#
> -# Unless required by applicable law or agreed to in writing, software
> -# distributed under the License is distributed on an "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> -# See the License for the specific language governing permissions and
> -# limitations under the License.
> -
> -OVN_BRANCH=$1
> -GITHUB_SRC=$2
> -
> -# Install deps
> -build_deps="rpm-build yum-utils yum-builddep automake autoconf
> openssl-devel \
> -epel-release python3 gdb libtool git bzip2 perl-core zlib-devel openssl
> git \
> -libtool"
> -
> -yum update -y
> -yum install @'Development Tools' ${build_deps} -y
> -
> -./install_ovn.sh $OVN_BRANCH $GITHUB_SRC
> -
> -# remove unused packages to make the container light weight.
> -for i in $(package-cleanup --leaves --all);
> - do yum remove -y $i; yum autoremove -y;
> -done
> -yum remove ${build_deps} -y
> -cd ..; rm -rf ovs; rm -rf ovn
> -
> -# Install basic utils
> -basic_utils="vim-minimal.x86_64 net-tools.x86_64 uuid.x86_64
> iproute.x86_64"
> -yum install -y ${basic_utils}
> diff --git a/utilities/docker/start-ovn b/utilities/docker/start-ovn
> deleted file mode 100755
> index 51e5162c5..000000000
> --- a/utilities/docker/start-ovn
> +++ /dev/null
> @@ -1,91 +0,0 @@
> -#!/bin/bash
> -#
> -# Licensed under the Apache License, Version 2.0 (the "License");
> -# you may not use this file except in compliance with the License.
> -# You may obtain a copy of the License at:
> -#
> -#
> https://nam10.safelinks.protection.outlook.com/?url=http%3A%2F%2Fwww.apache.org%2Flicenses%2FLICENSE-2.0&data=05%7C02%7Caginwala%40ebay.com%7Cba724190958345e35d8908ddcdac2fad%7C46326bff992841a0baca17c16c94ea99%7C0%7C0%7C638892861631429624%7CUnknown%7CTWFpbGZsb3d8eyJFbXB0eU1hcGkiOnRydWUsIlYiOiIwLjAuMDAwMCIsIlAiOiJXaW4zMiIsIkFOIjoiTWFpbCIsIldUIjoyfQ%3D%3D%7C0%7C%7C%7C&sdata=nt88mIilWc%2BJ0%2Bkr0CsHYSaTAjgHfY1iAinl0HAADA8%3D&reserved=0
> <http://www.apache.org/licenses/LICENSE-2.0>
> -#
> -# Unless required by applicable law or agreed to in writing, software
> -# distributed under the License is distributed on an "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> -# See the License for the specific language governing permissions and
> -# limitations under the License.
> -
> -case $1 in
> - "ovn-nb") /usr/share/ovn/scripts/ovn-ctl run_nb_ovsdb
> - ;;
> - "ovn-sb") /usr/share/ovn/scripts/ovn-ctl run_sb_ovsdb
> - ;;
> - "ovn-northd") ovn-northd --pidfile \
> - --ovnnb-db="unix:/var/run/ovn/ovnnb_db.sock" \
> - --ovnsb-db="unix:/var/run/ovn/ovnsb_db.sock" \
> - --log-file=/var/log/ovn/ovn-northd.log
> - ;;
> - "ovn-northd-cluster") ovn-northd --pidfile \
> - --ovnnb-db=$OVN_NB_DB \
> - --ovnsb-db=$OVN_SB_DB \
> - --log-file=/var/log/ovn/ovn-northd.log
> - ;;
> - "ovn-nb-tcp") source /etc/ovn/ovn_default_nb_port
> - /usr/share/ovn/scripts/ovn-ctl start_ovsdb
> - ovn-nbctl set-connection ptcp:$nb_db_port
> - /usr/share/ovn/scripts/ovn-ctl stop_ovsdb
> - /usr/share/ovn/scripts/ovn-ctl run_nb_ovsdb
> - ;;
> - "ovn-nb-cluster-create") /usr/share/ovn/scripts/ovn-ctl \
> - --db-nb-addr=$host_ip \
> - --db-nb-cluster-local-addr=$host_ip \
> - start_nb_ovsdb
> - ovn-nbctl set-connection ptcp:$nb_db_port
> - /usr/share/ovn/scripts/ovn-ctl
> stop_nb_ovsdb
> - /usr/share/ovn/scripts/ovn-ctl \
> - --db-nb-addr=$host_ip \
> - --db-nb-cluster-local-addr=$host_ip \
> - run_nb_ovsdb
> - ;;
> - "ovn-nb-cluster-join") /usr/share/ovn/scripts/ovn-ctl \
> - --db-nb-addr=$host_ip \
> - --db-nb-cluster-local-addr=$host_ip \
> - --db-nb-cluster-remote-addr=$remote_host \
> - run_nb_ovsdb
> - ;;
> - "ovn-sb-tcp") source /etc/ovn/ovn_default_sb_port
> - /usr/share/ovn/scripts/ovn-ctl start_ovsdb
> - ovn-sbctl set-connection ptcp:$sb_db_port
> - /usr/share/ovn/scripts/ovn-ctl stop_ovsdb
> - /usr/share/ovn/scripts/ovn-ctl run_sb_ovsdb
> - ;;
> - "ovn-northd-tcp") source /etc/ovn/ovn_default_northd_host
> - source /etc/ovn/ovn_default_nb_port
> - source /etc/ovn/ovn_default_sb_port
> - ovn-northd --pidfile \
> - --ovnnb-db="tcp:$northd_host:$nb_db_port" \
> - --ovnsb-db="tcp:$northd_host:$sb_db_port" \
> - --log-file=/var/log/ovn/ovn-northd.log
> - ;;
> - "ovn-sb-cluster-create") /usr/share/ovn/scripts/ovn-ctl \
> - --db-sb-addr=$host_ip \
> - --db-sb-cluster-local-addr=$host_ip \
> - start_sb_ovsdb
> - ovn-sbctl set-connection ptcp:$sb_db_port
> - /usr/share/ovn/scripts/ovn-ctl
> stop_sb_ovsdb
> - /usr/share/ovn/scripts/ovn-ctl \
> - --db-sb-addr=$host_ip \
> - --db-sb-cluster-local-addr=$host_ip \
> - run_sb_ovsdb
> - ;;
> - "ovn-sb-cluster-join") /usr/share/ovn/scripts/ovn-ctl \
> - --db-sb-addr=$host_ip \
> - --db-sb-cluster-local-addr=$host_ip \
> - --db-sb-cluster-remote-addr=$remote_host \
> - run_sb_ovsdb
> - ;;
> - "ovn-controller") ovn-controller --pidfile \
> - --log-file=/var/log/ovn/ovn-controller.log
> - ;;
> - *) echo "$0 [ovn-nb-tcp|ovn-sb-tcp|ovn-northd-tcp|ovn-controller
> - |ovn-nb-cluster-create|ovn-nb-cluster-join
> - |ovn-sb-cluster-create|ovn-sb-cluster-join
> - |ovn-northd-cluster]"
> -esac
> \ No newline at end of file
> --
> 2.50.0
>
Thank you Aliasgar,
I went ahead and merged this into main.
Regards,
Ales
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
