Compress image using xz

Signed-off-by: Ferenc Tóth <ferenc.2.toth@nokia.com>
Change-Id: Iedb116465d5421a2e5e5245c6f7992033b01f6d6

diff --git a/.gitreview b/.gitreview
new file mode 100644 (file)
index 0000000..e5bd6d5
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,5 @@
+[gerrit]
+host=gerrit.akraino.org
+port=29418
+project=ta/caas-logging
+defaultremote=origin

diff --git a/SPECS/elasticsearch.spec b/SPECS/elasticsearch.spec
index 928a972..0034d96 100644 (file)
--- a/SPECS/elasticsearch.spec
+++ b/SPECS/elasticsearch.spec
@@ -15,7 +15,7 @@
 %define COMPONENT elasticsearch
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 7.1.1
-%define RPM_MINOR_VERSION 1
+%define RPM_MINOR_VERSION 2
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 
 Name:           %{RPM_NAME}
@@ -28,8 +28,8 @@ BuildArch:      x86_64
 Vendor:         %{_platform_vendor} and elastic/elasticsearch 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 >= 18.09.2, xz
 
 %description
 This RPM contains the Elasticsearch container image 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/fluentd.spec b/SPECS/fluentd.spec
index a9b4223..6af5a31 100644 (file)
--- a/SPECS/fluentd.spec
+++ b/SPECS/fluentd.spec
@@ -15,7 +15,7 @@
 %define COMPONENT fluentd
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 1.5.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 fluent/fluentd 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 >= 18.09.2, xz
 
 %description
 This RPM contains the Fluentd container image, and related deployment artifacts for the 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}