X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fcaas-danm.git;a=blobdiff_plain;f=SPECS%2Fcaas-sriovdp.spec;h=b1f377d2358cbb919f61d58d57695b76a71be55d;hp=1da400e2d83bddb35382d62df1b158cb7d5e3b8a;hb=28cd26b9968050dae219e38acf398b2119630ad4;hpb=c39dd7c86ccbdcf5802f88162579991db1b62961 diff --git a/SPECS/caas-sriovdp.spec b/SPECS/caas-sriovdp.spec index 1da400e..b1f377d 100644 --- a/SPECS/caas-sriovdp.spec +++ b/SPECS/caas-sriovdp.spec @@ -14,9 +14,11 @@ %define COMPONENT sriovdp %define RPM_NAME caas-%{COMPONENT} -%define RPM_MAJOR_VERSION 2.0.0 -%define RPM_MINOR_VERSION 2 +%define RPM_MAJOR_VERSION 3.0.0 +%define RPM_MINOR_VERSION 1 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION} +%define go_version 1.12.10 +%define SRIOVDP_HASH a015e56ae715e2b6dae15e42827e4e8f43eeceac Name: %{RPM_NAME} Version: %{RPM_MAJOR_VERSION} @@ -28,8 +30,8 @@ BuildArch: x86_64 Vendor: %{_platform_vendor} and intel/sriov-network-device-plugin unmodified Source0: %{name}-%{version}.tar.gz -Requires: docker-ce >= 18.09.2 -BuildRequires: docker-ce >= 18.09.2 +Requires: docker-ce >= 18.09.2, rsync +BuildRequires: docker-ce-cli >= 18.09.2, xz %description This RPM contains the sriov network device plugin container for CaaS subsystem. @@ -48,13 +50,15 @@ docker build \ --build-arg http_proxy="${http_proxy}" \ --build-arg https_proxy="${https_proxy}" \ --build-arg no_proxy="${no_proxy}" \ - --build-arg SRIOV="%{RPM_MAJOR_VERSION}" \ + --build-arg SRIOVDP="%{RPM_MAJOR_VERSION}" \ + --build-arg SRIOVDP_HASH="%{SRIOVDP_HASH}" \ + --build-arg go_version="%{go_version}" \ --tag %{COMPONENT}:%{IMAGE_TAG} \ %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build/%{COMPONENT}/ mkdir -p %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save/ -docker save %{COMPONENT}:%{IMAGE_TAG} | gzip -c > %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save/%{COMPONENT}:%{IMAGE_TAG}.tar +docker save %{COMPONENT}:%{IMAGE_TAG} | xz -z -T2 > %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save/%{COMPONENT}:%{IMAGE_TAG}.tar docker rmi -f %{COMPONENT}:%{IMAGE_TAG}