X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=SPECS%2Fcaas-chartrepo.spec;h=9bc2b665d73ca9f9cd03dd44206918be5570f2b2;hb=14c3d7f410dc71ce5b6c8947c72b7c52b1f9e042;hp=97ca95de7d44ad40ac948ffefbc3c9c941317976;hpb=ba9daf04aeea4ada6f0993f538727803b6ce78fc;p=ta%2Fcaas-helm.git diff --git a/SPECS/caas-chartrepo.spec b/SPECS/caas-chartrepo.spec index 97ca95d..9bc2b66 100644 --- a/SPECS/caas-chartrepo.spec +++ b/SPECS/caas-chartrepo.spec @@ -15,7 +15,8 @@ %define COMPONENT chartrepo %define RPM_NAME caas-%{COMPONENT} %define RPM_MAJOR_VERSION 1.0.0 -%define RPM_MINOR_VERSION 2 +%define RPM_MINOR_VERSION 11 +%define go_version 1.12.10 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION} %define docker_build_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build %define docker_save_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save @@ -25,12 +26,12 @@ Version: %{RPM_MAJOR_VERSION} Release: %{RPM_MINOR_VERSION}%{?dist} Summary: Containers as a Service %{COMPONENT} component License: %{_platform_licence} and MIT license and BSD and Apache License and Lesser General Public License -BuildArch: x86_64 +BuildArch: %{_arch} Vendor: %{_platform_vendor} and kubernetes/kubernetes unmodified Source0: %{name}-%{version}.tar.gz -Requires: docker-ce >= 18.09.2 -BuildRequires: docker-ce-cli >= 18.09.2 +Requires: docker-ce >= 18.09.2, rsync +BuildRequires: docker-ce-cli >= 18.09.2, xz %description This rpm contains the %{COMPONENT} container for CaaS subsystem. @@ -51,10 +52,11 @@ docker build \ --build-arg http_proxy="${http_proxy}" \ --build-arg https_proxy="${https_proxy}" \ --build-arg no_proxy="${no_proxy}" \ + --build-arg go_version="%{go_version}" \ --tag %{COMPONENT}:%{IMAGE_TAG} \ %{docker_build_dir}/chartrepohandler mkdir -p %{docker_save_dir} -docker save %{COMPONENT}:%{IMAGE_TAG} | gzip -c > %{docker_save_dir}/%{COMPONENT}:%{IMAGE_TAG}.tar +docker save %{COMPONENT}:%{IMAGE_TAG} | xz -z -T2 > %{docker_save_dir}/%{COMPONENT}:%{IMAGE_TAG}.tar docker rmi %{COMPONENT}:%{IMAGE_TAG} %install