X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=SPECS%2Fcaas-chartrepo.spec;h=d021788a245cbbcf34fada50a3b361b2906b929b;hb=aa795c01743537abf71f6bd20303c1320ac63888;hp=7892fce06b853f49390acab93c93dbde87b89813;hpb=8dc6e1f47962bca301647bb361237dfba1a911d1;p=ta%2Fcaas-helm.git diff --git a/SPECS/caas-chartrepo.spec b/SPECS/caas-chartrepo.spec index 7892fce..d021788 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 3 +%define RPM_MINOR_VERSION 12 +%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