X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=rpmbuild.spec;h=e6f6ca92d024ef14122ccff7b3ffa5599a2b4c30;hb=c8bab750499effe741e2d9d06e902852df4c2f61;hp=0e9b6562aecef1d431b737f7846a0923c995d95a;hpb=83169e6248c4ddbcd18d516b3b30de989a09fffd;p=ta%2Fcaas-kubedns.git

diff --git a/rpmbuild.spec b/rpmbuild.spec
index 0e9b656..e6f6ca9 100644
--- a/rpmbuild.spec
+++ b/rpmbuild.spec
@@ -14,9 +14,10 @@
 
 %define COMPONENT kubedns
 %define RPM_NAME caas-%{COMPONENT}
-%define RPM_MAJOR_VERSION 1.15.2
+%define RPM_MAJOR_VERSION 1.15.7
 %define RPM_MINOR_VERSION 0
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
+%define go_version 1.12.10
 
 Name:           %{RPM_NAME}
 Version:        %{RPM_MAJOR_VERSION}
@@ -24,12 +25,12 @@ Release:        %{RPM_MINOR_VERSION}%{?dist}
 Summary:        Containers as a Service Kube DNS component
 License:        %{_platform_license} and Apache License and GNU Lesser General Public License v3.0 only and BSD 3-clause New or Revised License and MIT License and Common Development and Distribution License and BSD and GNU General Public License v2.0 only
 URL:            https://github.com/kubernetes/dns
-BuildArch:      x86_64
+BuildArch:      %{_arch}
 Vendor:         %{_platform_vendor} and Kubernetes DNS service 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 kubedns container image, and related deployment artifacts for the CaaS subsystem.
@@ -49,7 +50,8 @@ docker build \
   --build-arg http_proxy="${http_proxy}" \
   --build-arg https_proxy="${https_proxy}" \
   --build-arg no_proxy="${no_proxy}" \
-  --build-arg KUBEDNS="%{RPM_MAJOR_VERSION}" \
+  --build-arg KUBEDNS_VERSION="%{RPM_MAJOR_VERSION}" \
+  --build-arg go_version="%{go_version}" \
   --tag %{COMPONENT}:%{IMAGE_TAG} \
   %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build/%{COMPONENT}/
 
@@ -57,7 +59,7 @@ docker build \
 mkdir -p %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save/
 
 # Save the 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}