From 774362cdfa5935c198ce7fd9e695f39585f40b90 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ferenc=20T=C3=B3th?= Date: Fri, 21 Jun 2019 11:41:37 +0200 Subject: [PATCH] Compress image using xz MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Ferenc Tóth Change-Id: If16757819e1a5ba7d3dd913d7595b6086f3a1155 --- .gitreview | 5 +++++ SPECS/caas-chartrepo.spec | 8 ++++---- SPECS/caas-helm.spec | 6 +++--- 3 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 .gitreview diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..fa05ebf --- /dev/null +++ b/.gitreview @@ -0,0 +1,5 @@ +[gerrit] +host=gerrit.akraino.org +port=29418 +project=ta/caas-helm +defaultremote=origin diff --git a/SPECS/caas-chartrepo.spec b/SPECS/caas-chartrepo.spec index 7892fce..8e5c0ed 100644 --- a/SPECS/caas-chartrepo.spec +++ b/SPECS/caas-chartrepo.spec @@ -15,7 +15,7 @@ %define COMPONENT chartrepo %define RPM_NAME caas-%{COMPONENT} %define RPM_MAJOR_VERSION 1.0.0 -%define RPM_MINOR_VERSION 3 +%define RPM_MINOR_VERSION 4 %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 @@ -29,8 +29,8 @@ BuildArch: x86_64 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. @@ -54,7 +54,7 @@ docker build \ --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 diff --git a/SPECS/caas-helm.spec b/SPECS/caas-helm.spec index 96e9501..55d1ee4 100644 --- a/SPECS/caas-helm.spec +++ b/SPECS/caas-helm.spec @@ -33,8 +33,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 +83,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 -- 2.16.6