%define COMPONENT danm
%define RPM_NAME caas-%{COMPONENT}
-%define RPM_MAJOR_VERSION 3.2.0
-%define RPM_MINOR_VERSION 1
+%define RPM_MAJOR_VERSION 3.3.0
+%define RPM_MINOR_VERSION 4
+%define DANM_VERSION v%{RPM_MAJOR_VERSION}
%define CNI_VERSION 0.7.0
-%define DANM_VERSION b48eb154a7f81fcafb0ff9e5b7d3ca6b54e6565a
%define go_version 1.12.1
-%define SRIOV_VERSION 6b53446e5781570c44e399cccb1fcdfa417f43a1
+%define SRIOV_VERSION 9e4c973b2ac517c64867e33d61aee152d70dc330
%define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
%define binary_build_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/binary-save
%define docker_build_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build
Vendor: %{_platform_vendor} and Nokia
Source0: %{name}-%{version}.tar.gz
-Requires: docker-ce >= 18.09.2, iputils
-BuildRequires: docker-ce >= 18.09.2, git
+Requires: docker-ce >= 18.09.2, iputils, rsync
+BuildRequires: docker-ce-cli >= 18.09.2, curl
# more info at: https://fedoraproject.org/wiki/Packaging:Debuginfo No build ID note in Flannel
%global debug_package %{nil}
mkdir -p %{buildroot}/opt/cni/bin/
# Generic CNI plugins
# Don't use the standard ipvlan binary \
-# Dont't use portmap, quick fix for CVE-2019-9946 \
+# Don't use portmap, quick fix for CVE-2019-9946 \
rsync -av \
--chmod=go+rx,u+rwx \
--exclude=ipvlan \