X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=SPECS%2Fcaas-helm.spec;h=ae9dcb6065311cca6433d9bd4f05077efd283c89;hb=1bf60aa38b0c1f5612447e7be1722aabd2d683ab;hp=ed0618408fe13aed1b48dd7ad82df1bb9a242f96;hpb=d76dcc93aa915bd8a0f7f36e47b90d5178203044;p=ta%2Fcaas-helm.git diff --git a/SPECS/caas-helm.spec b/SPECS/caas-helm.spec index ed06184..ae9dcb6 100644 --- a/SPECS/caas-helm.spec +++ b/SPECS/caas-helm.spec @@ -14,11 +14,10 @@ %define COMPONENT helm %define RPM_NAME caas-%{COMPONENT} -%define RPM_MAJOR_VERSION 2.13.1 -%define RPM_MINOR_VERSION 2 +%define RPM_MAJOR_VERSION 2.14.3 +%define RPM_MINOR_VERSION 4 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION} -%define go_version 1.11.5 -%define cni_plugins_version 0.7.0 +%define go_version 1.12.10 %define binary_build_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/binary-save %define docker_build_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build %define docker_save_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save @@ -33,8 +32,8 @@ BuildArch: x86_64 Vendor: %{_platform_vendor} and helm/helm 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, rsync, xz %description This rpm contains the %{COMPONENT} container for CaaS subsystem. @@ -83,7 +82,7 @@ docker build \ --tag tiller:%{IMAGE_TAG} \ %{docker_build_dir}/tiller mkdir -p %{docker_save_dir}/ -docker save tiller:%{IMAGE_TAG} | gzip -c > "%{docker_save_dir}/tiller:%{IMAGE_TAG}.tar" +docker save tiller:%{IMAGE_TAG} | xz -z -T2 > "%{docker_save_dir}/tiller:%{IMAGE_TAG}.tar" docker rmi tiller:%{IMAGE_TAG} %install