From: Numan Siddique <num...@ovn.org> fedora 37 is already end of life cycle.
The fedora version number can be passed to the Dockerfile of ovn-kubernetes. Signed-off-by: Numan Siddique <num...@ovn.org> --- .ci/ovn-kubernetes/Dockerfile | 10 ++++++++-- .github/workflows/ovn-kubernetes.yml | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.ci/ovn-kubernetes/Dockerfile b/.ci/ovn-kubernetes/Dockerfile index 554b5551b5..caaa41708c 100644 --- a/.ci/ovn-kubernetes/Dockerfile +++ b/.ci/ovn-kubernetes/Dockerfile @@ -1,7 +1,8 @@ ARG OVNKUBE_COMMIT ARG GO_VERSION +ARG FEDORA_VERSION -FROM fedora:37 AS ovnbuilder +FROM fedora:$FEDORA_VERSION AS ovnbuilder USER root @@ -37,6 +38,7 @@ RUN rm rpm/rpmbuild/RPMS/x86_64/*docker* ARG GO_VERSION FROM golang:$GO_VERSION as ovnkubebuilder ARG OVNKUBE_COMMIT +ARG FEDORA_VERSION # Clone OVN Kubernetes and build the binary based on the commit passed as argument WORKDIR /root @@ -63,7 +65,7 @@ COPY --from=ovnbuilder /tmp/ovn/ovn-sb.ovsschema pkg/sbdb/ovn-sb.ovsschema RUN go generate ./pkg/nbdb && go generate ./pkg/sbdb && make # Build the final image -FROM fedora:37 +FROM fedora:$FEDORA_VERSION # install needed dependencies RUN INSTALL_PKGS=" \ @@ -76,6 +78,10 @@ RUN mkdir -p /var/run/openvswitch COPY --from=ovnbuilder /tmp/ovn/rpm/rpmbuild/RPMS/x86_64/*rpm ./ COPY --from=ovnbuilder /tmp/ovn/ovs/rpm/rpmbuild/RPMS/x86_64/*rpm ./ COPY --from=ovnbuilder /tmp/ovn/ovs/rpm/rpmbuild/RPMS/noarch/*rpm ./ + +# Delete network-scripts-openvswitch rpm generated earlier as it requires +# network-scripts package and it is no longer available from Fedora 41. +RUN rm -f network-scripts* RUN dnf install -y *.rpm && rm -f *.rpm # install ovn-kubernetes binaries built in previous stage diff --git a/.github/workflows/ovn-kubernetes.yml b/.github/workflows/ovn-kubernetes.yml index 50e48d11f8..83a305aa26 100644 --- a/.github/workflows/ovn-kubernetes.yml +++ b/.github/workflows/ovn-kubernetes.yml @@ -52,6 +52,7 @@ jobs: run: | docker build --build-arg OVNKUBE_COMMIT=${{ env.OVNKUBE_COMMIT }} \ --build-arg GO_VERSION=${{ env.GO_VERSION }} \ + --build-arg FEDORA_VERSION=41 \ --squash -t ovn-daemonset-f:dev -f .ci/ovn-kubernetes/Dockerfile . mkdir /tmp/_output docker save ovn-daemonset-f:dev > /tmp/_output/image.tar -- 2.47.1 _______________________________________________ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev