X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=SPECS%2Fcaas-sriovdp.spec;h=656026af0e4dc5ff1c89da49e7f61b990a6b9f3e;hb=9a8cb167338fb9576d3682abaf7854fc0cb8af4f;hp=08352b6047329539998592ae64425a4e5e804c88;hpb=35c548f30aa5226796e8fb786475da40f6548889;p=ta%2Fcaas-danm.git diff --git a/SPECS/caas-sriovdp.spec b/SPECS/caas-sriovdp.spec index 08352b6..656026a 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 3 +%define RPM_MAJOR_VERSION 3.1.0 +%define RPM_MINOR_VERSION 1 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION} +%define go_version 1.12.10 +%define SRIOVDP 3.1 Name: %{RPM_NAME} Version: %{RPM_MAJOR_VERSION} @@ -24,12 +26,12 @@ Release: %{RPM_MINOR_VERSION}%{?dist} Summary: Containers as a Service sriov network device plugin component License: %{_platform_license} and Apache License 2.0 URL: https://github.com/intel/sriov-network-device-plugin/ -BuildArch: x86_64 +BuildArch: %{_arch} Vendor: %{_platform_vendor} and intel/sriov-network-device-plugin unmodified Source0: %{name}-%{version}.tar.gz Requires: docker-ce >= 18.09.2, rsync -BuildRequires: docker-ce >= 18.09.2 +BuildRequires: docker-ce-cli >= 18.09.2, xz %description This RPM contains the sriov network device plugin container for CaaS subsystem. @@ -48,13 +50,14 @@ docker build \ --build-arg http_proxy="${http_proxy}" \ --build-arg https_proxy="${https_proxy}" \ --build-arg no_proxy="${no_proxy}" \ - --build-arg SRIOVDP="%{RPM_MAJOR_VERSION}" \ + --build-arg SRIOVDP="%{SRIOVDP}" \ + --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}