X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fcaas-kubernetes.git;a=blobdiff_plain;f=caas-kubernetes.spec;h=9c74ca3211b42e03ea830a623348fe8e613ec4ac;hp=76d5598971b4ec6959f843f510fcc3f5fe780d40;hb=e79c146d970397bdcb4f66051b3109701f7845b4;hpb=541d83d42b3c9fc0cae6d93b0af73f9d5ef4823a

diff --git a/caas-kubernetes.spec b/caas-kubernetes.spec
index 76d5598..9c74ca3 100644
--- a/caas-kubernetes.spec
+++ b/caas-kubernetes.spec
@@ -14,8 +14,8 @@
 
 %define COMPONENT kubernetes
 %define RPM_NAME caas-%{COMPONENT}
-%define RPM_MAJOR_VERSION 1.15.3
-%define RPM_MINOR_VERSION 6
+%define RPM_MAJOR_VERSION 1.16.0
+%define RPM_MINOR_VERSION 4
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 %define KUBERNETESPAUSE_VERSION 3.1
 
@@ -31,7 +31,7 @@ Version:        %{RPM_MAJOR_VERSION}
 Release:        %{RPM_MINOR_VERSION}%{?dist}
 Summary:        Containers as a Service %{COMPONENT} component
 License:        %{_platform_licence} and Apache License and GNU General Public License v2.0 only and GNU Lesser General Public License v2.1 only and MIT license and BSD and MIT license and ISC License and Creative Commons Attribution ShareAlike 4.0 International and Mozilla Public License and COMMON DEVELOPMENT AND DISTRIBUTION LICENSE and Lesser General Public License and Creative Commons - Public Domain and Creative Commons Public License and BSD 3-Clause License
-BuildArch:      x86_64
+BuildArch:      %{_arch}
 Vendor:         %{_platform_vendor} and kubernetes/kubernetes unmodified
 Source0:        %{name}-%{version}.tar.gz
 
@@ -114,11 +114,11 @@ docker build \
   --build-arg https_proxy="${https_proxy}" \
   --build-arg no_proxy="${no_proxy}" \
   --build-arg KUBERNETESPAUSE_VERSION="%{KUBERNETESPAUSE_VERSION}" \
-  --tag kubernetespause:%{IMAGE_TAG} \
+  --tag kubernetespause:%{KUBERNETESPAUSE_VERSION} \
   %{docker_build_dir}/kubernetespause
 mkdir -p %{docker_save_dir}
-docker save kubernetespause:%{IMAGE_TAG} | xz -z -T2 > "%{docker_save_dir}/kubernetespause:%{IMAGE_TAG}.tar"
-docker rmi kubernetespause:%{IMAGE_TAG}
+docker save kubernetespause:%{KUBERNETESPAUSE_VERSION} | xz -z -T2 > "%{docker_save_dir}/kubernetespause:%{KUBERNETESPAUSE_VERSION}.tar"
+docker rmi kubernetespause:%{KUBERNETESPAUSE_VERSION}
 
 %install
 mkdir -p %{buildroot}/%{_caas_container_tar_path}