From 30d0f116c26414a9e703dc37bef90e399717abcb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ferenc=20T=C3=B3th?= Date: Tue, 18 Jun 2019 16:34:16 +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: I3b1b5f56dcbf30fd7753263d826a71e30647b2a7 --- SPECS/caas-danm.spec | 4 ++-- SPECS/caas-flannel.spec | 8 ++++---- SPECS/caas-netwatcher.spec | 8 ++++---- SPECS/caas-sriovdp.spec | 6 +++--- SPECS/caas-svcwatcher.spec | 8 ++++---- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/SPECS/caas-danm.spec b/SPECS/caas-danm.spec index b65b7b3..435f8c3 100644 --- a/SPECS/caas-danm.spec +++ b/SPECS/caas-danm.spec @@ -15,7 +15,7 @@ %define COMPONENT danm %define RPM_NAME caas-%{COMPONENT} %define RPM_MAJOR_VERSION 3.3.0 -%define RPM_MINOR_VERSION 3 +%define RPM_MINOR_VERSION 4 %define DANM_VERSION v%{RPM_MAJOR_VERSION} %define CNI_VERSION 0.7.0 %define go_version 1.12.1 @@ -36,7 +36,7 @@ Vendor: %{_platform_vendor} and Nokia Source0: %{name}-%{version}.tar.gz Requires: docker-ce >= 18.09.2, iputils, rsync -BuildRequires: docker-ce >= 18.09.2, rsync +BuildRequires: docker-ce-cli >= 18.09.2, curl # more info at: https://fedoraproject.org/wiki/Packaging:Debuginfo No build ID note in Flannel %global debug_package %{nil} diff --git a/SPECS/caas-flannel.spec b/SPECS/caas-flannel.spec index 8fd357d..4df97b1 100644 --- a/SPECS/caas-flannel.spec +++ b/SPECS/caas-flannel.spec @@ -15,7 +15,7 @@ %define COMPONENT flannel %define RPM_NAME caas-%{COMPONENT} %define RPM_MAJOR_VERSION 0.11.0 -%define RPM_MINOR_VERSION 2 +%define RPM_MINOR_VERSION 3 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION} Name: %{RPM_NAME} @@ -28,8 +28,8 @@ BuildArch: x86_64 Vendor: %{_platform_vendor} and coreos/flannel 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 Flannel container image, and related deployment artifacts for the CaaS subsystem. @@ -55,7 +55,7 @@ docker build \ mkdir -p %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save/ -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 docker rmi -f %{COMPONENT}:%{IMAGE_TAG} diff --git a/SPECS/caas-netwatcher.spec b/SPECS/caas-netwatcher.spec index f7ab175..ca1e6e5 100644 --- a/SPECS/caas-netwatcher.spec +++ b/SPECS/caas-netwatcher.spec @@ -15,7 +15,7 @@ %define COMPONENT netwatcher %define RPM_NAME caas-%{COMPONENT} %define RPM_MAJOR_VERSION 3.3.0 -%define RPM_MINOR_VERSION 2 +%define RPM_MINOR_VERSION 3 %define DANM_VERSION v%{RPM_MAJOR_VERSION} %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION} @@ -29,8 +29,8 @@ BuildArch: x86_64 Vendor: %{_platform_vendor} and Nokia 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 netwatcher container image, and related deployment artifacts for the CaaS subsystem. @@ -55,7 +55,7 @@ docker build \ mkdir -p %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save/ -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 docker rmi -f %{COMPONENT}:%{IMAGE_TAG} diff --git a/SPECS/caas-sriovdp.spec b/SPECS/caas-sriovdp.spec index 08352b6..3e0b554 100644 --- a/SPECS/caas-sriovdp.spec +++ b/SPECS/caas-sriovdp.spec @@ -15,7 +15,7 @@ %define COMPONENT sriovdp %define RPM_NAME caas-%{COMPONENT} %define RPM_MAJOR_VERSION 2.0.0 -%define RPM_MINOR_VERSION 3 +%define RPM_MINOR_VERSION 4 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION} Name: %{RPM_NAME} @@ -29,7 +29,7 @@ Vendor: %{_platform_vendor} and intel/sriov-network-device-plugin unmodi Source0: %{name}-%{version}.tar.gz Requires: docker-ce >= 18.09.2, rsync -BuildRequires: docker-ce >= 18.09.2 +BuildRequires: docker-ce-cli >= 18.09.2, xz %description This RPM contains the sriov network device plugin container for CaaS subsystem. @@ -54,7 +54,7 @@ docker build \ mkdir -p %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save/ -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 docker rmi -f %{COMPONENT}:%{IMAGE_TAG} diff --git a/SPECS/caas-svcwatcher.spec b/SPECS/caas-svcwatcher.spec index 5c82736..9f57903 100644 --- a/SPECS/caas-svcwatcher.spec +++ b/SPECS/caas-svcwatcher.spec @@ -15,7 +15,7 @@ %define COMPONENT svcwatcher %define RPM_NAME caas-%{COMPONENT} %define RPM_MAJOR_VERSION 3.3.0 -%define RPM_MINOR_VERSION 2 +%define RPM_MINOR_VERSION 3 %define DANM_VERSION v%{RPM_MAJOR_VERSION} %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION} @@ -29,8 +29,8 @@ BuildArch: x86_64 Vendor: %{_platform_vendor} and Nokia 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 DANM project's Service watcher sub-component for CaaS subsystem. @@ -55,7 +55,7 @@ docker build \ mkdir -p %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save/ -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 docker rmi -f %{COMPONENT}:%{IMAGE_TAG} -- 2.16.6