From 006abaa59c587ddeec59365e939b64ddb843e27d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ferenc=20T=C3=B3th?= Date: Tue, 18 Jun 2019 16:16:54 +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: I99aa68ea87b73f3469dccaea00ec5c45fd9f7e43 --- .gitreview | 5 +++++ rpmbuild.spec | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 .gitreview diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..151924f --- /dev/null +++ b/.gitreview @@ -0,0 +1,5 @@ +[gerrit] +host=gerrit.akraino.org +port=29418 +project=ta/caas-kubedns +defaultremote=origin diff --git a/rpmbuild.spec b/rpmbuild.spec index 0e9b656..f6f9af0 100644 --- a/rpmbuild.spec +++ b/rpmbuild.spec @@ -15,7 +15,7 @@ %define COMPONENT kubedns %define RPM_NAME caas-%{COMPONENT} %define RPM_MAJOR_VERSION 1.15.2 -%define RPM_MINOR_VERSION 0 +%define RPM_MINOR_VERSION 1 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION} Name: %{RPM_NAME} @@ -28,8 +28,8 @@ BuildArch: x86_64 Vendor: %{_platform_vendor} and Kubernetes DNS service unmodified Source0: %{name}-%{version}.tar.gz -Requires: docker-ce >= 18.09.2 -BuildRequires: docker-ce >= 18.09.2 +Requires: docker-ce >= 18.09.2, rsync +BuildRequires: docker-ce-cli >= 18.09.2, xz %description This RPM contains the kubedns container image, and related deployment artifacts for the CaaS subsystem. @@ -57,7 +57,7 @@ docker build \ mkdir -p %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save/ # Save the container -docker save %{COMPONENT}:%{IMAGE_TAG} | gzip -c > %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save/%{COMPONENT}:%{IMAGE_TAG}.tar +docker save %{COMPONENT}:%{IMAGE_TAG} | xz -z -T2 > %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save/%{COMPONENT}:%{IMAGE_TAG}.tar # Remove docker image docker rmi -f %{COMPONENT}:%{IMAGE_TAG} -- 2.16.6