X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=SPECS%2Fcaas-metrics_server.spec;h=f9664879fce42bd0b401e0ee7fda18dc48700bed;hb=6320370425e6949fdfd558f11d37a79885c6275f;hp=a6bb90085a8ec611c98b221d49b21cf54d013982;hpb=a85fbfe0f5af90c3dd5a41b701d2e0fd2d4e3d7e;p=ta%2Fcaas-metrics.git

diff --git a/SPECS/caas-metrics_server.spec b/SPECS/caas-metrics_server.spec
index a6bb900..f966487 100644
--- a/SPECS/caas-metrics_server.spec
+++ b/SPECS/caas-metrics_server.spec
@@ -14,9 +14,10 @@
 
 %define COMPONENT metrics_server
 %define RPM_NAME caas-%{COMPONENT}
-%define RPM_MAJOR_VERSION 0.3.3
+%define RPM_MAJOR_VERSION 0.3.6
 %define RPM_MINOR_VERSION 0
-%define DEPENDENCY_MANAGER_VERSION 0.5.0
+%define go_version 1.12.10
+%define DEP_MAN_VERSION 0.5.4
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 
 Name:           %{RPM_NAME}
@@ -25,12 +26,12 @@ Release:        %{RPM_MINOR_VERSION}%{?dist}
 Summary:        Containers as a Service Metrics Server component
 License:        %{_platform_license} and MIT license and BSD and Apache License and GNU LGPLv3
 URL:            https://github.com/kubernetes-incubator/metrics-server
-BuildArch:      x86_64
+BuildArch:      %{_arch}
 Vendor:         %{_platform_vendor} and kubernetes-incubator/metrics-server 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 metrics server container image for the CaaS subsystem.
@@ -49,14 +50,15 @@ docker build \
   --build-arg http_proxy="${http_proxy}" \
   --build-arg https_proxy="${https_proxy}" \
   --build-arg no_proxy="${no_proxy}" \
-  --build-arg METRICS_SERVER="%{RPM_MAJOR_VERSION}" \
-  --build-arg DEPENDENCY_MANAGER="%{DEPENDENCY_MANAGER_VERSION}" \
+  --build-arg METRICS_SERVER_VERSION="%{RPM_MAJOR_VERSION}" \
+  --build-arg DEP_MAN_VERSION="%{DEP_MAN_VERSION}" \
+  --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}