X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=rpmbuild.spec;h=22cd3f6254693477f978bd835726e5d0c0495bab;hb=787a10094712cd6ebd884dbac072302a75aacf31;hp=bae169bd0e6b2bb7580b42008d8c0bb25c0a58bb;hpb=6554d269f0133bc0efa7841c17ad5454755bcec0;p=ta%2Fcaas-cpupooler.git

diff --git a/rpmbuild.spec b/rpmbuild.spec
index bae169b..22cd3f6 100644
--- a/rpmbuild.spec
+++ b/rpmbuild.spec
@@ -15,9 +15,11 @@
 %define COMPONENT cpupooler
 %define COMPONENT_PART process-starter
 %define RPM_NAME caas-%{COMPONENT}
-%define RPM_MAJOR_VERSION 0.2.0
-%define RPM_MINOR_VERSION 2
-%define DEPENDENCY_MANAGER_VERSION 0.5.0
+%define RPM_MAJOR_VERSION 0.3.0
+%define RPM_MINOR_VERSION 5
+%define go_version 1.12.9
+%define CPUPOOLER_VERSION 603d1128aa982493d50d682b2edb37fe17b73031
+%define DEP_MAN_VERSION 0.5.0
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 %define PROCESS_STARTER_INSTALL_PATH /opt/bin/
 
@@ -31,8 +33,8 @@ BuildArch:      x86_64
 Vendor:         %{_platform_vendor} and Nokia
 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
 
 # I was able to pack an executable via this.
 # more info at https://fedoraproject.org/wiki/Packaging:Debuginfo
@@ -56,8 +58,9 @@ docker build \
   --build-arg http_proxy="${http_proxy}" \
   --build-arg https_proxy="${https_proxy}" \
   --build-arg no_proxy="${no_proxy}" \
-  --build-arg DEPENDENCY_MANAGER="%{DEPENDENCY_MANAGER_VERSION}" \
-  --build-arg CPUPOOLER="%{RPM_MAJOR_VERSION}" \
+  --build-arg go_version="%{go_version}" \
+  --build-arg DEP_MAN_VERSION="%{DEP_MAN_VERSION}" \
+  --build-arg CPUPOOLER_VERSION="%{CPUPOOLER_VERSION}" \
   --tag %{COMPONENT_PART}:builder \
   %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build/%{COMPONENT_PART}/
 
@@ -102,8 +105,9 @@ docker build \
   --build-arg http_proxy="${http_proxy}" \
   --build-arg https_proxy="${https_proxy}" \
   --build-arg no_proxy="${no_proxy}" \
-  --build-arg DEPENDENCY_MANAGER="%{DEPENDENCY_MANAGER_VERSION}" \
-  --build-arg CPUPOOLER="%{RPM_MAJOR_VERSION}" \
+  --build-arg DEP_MAN_VERSION="%{DEP_MAN_VERSION}" \
+  --build-arg CPUPOOLER_VERSION="%{CPUPOOLER_VERSION}" \
+  --build-arg go_version="%{go_version}" \
   --tag %{COMPONENT}:%{IMAGE_TAG} \
   %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build/%{COMPONENT}/
 
@@ -111,7 +115,7 @@ docker build \
 mkdir -p %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save/
 
 # save the cpu poooler container
-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
 
 # remove docker image
 docker rmi -f %{COMPONENT}:%{IMAGE_TAG}