From d254ec439e14213a84cc246cf5995617fc454091 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ferenc=20T=C3=B3th?= Date: Tue, 18 Jun 2019 15:57:11 +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: Ieb332a3efe4263853fd422edb0561cbeb9a4e16a --- .gitreview | 5 +++++ SPECS/caas-custom_metrics.spec | 8 ++++---- SPECS/caas-metrics_server.spec | 8 ++++---- SPECS/caas-prometheus.spec | 8 ++++---- 4 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 .gitreview diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..f034f9c --- /dev/null +++ b/.gitreview @@ -0,0 +1,5 @@ +[gerrit] +host=gerrit.akraino.org +port=29418 +project=ta/caas-metrics +defaultremote=origin diff --git a/SPECS/caas-custom_metrics.spec b/SPECS/caas-custom_metrics.spec index 86050ca..7ee14f4 100644 --- a/SPECS/caas-custom_metrics.spec +++ b/SPECS/caas-custom_metrics.spec @@ -15,7 +15,7 @@ %define COMPONENT custom_metrics %define RPM_NAME caas-%{COMPONENT} %define RPM_MAJOR_VERSION 0.5.0 -%define RPM_MINOR_VERSION 0 +%define RPM_MINOR_VERSION 1 %define DEPENDENCY_MANAGER_VERSION 0.5.0 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION} @@ -29,8 +29,8 @@ BuildArch: x86_64 Vendor: %{_platform_vendor} and DirectXMan12/k8s-prometheus-adapter 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 custom metrics container image 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-metrics_server.spec b/SPECS/caas-metrics_server.spec index a6bb900..2c40908 100644 --- a/SPECS/caas-metrics_server.spec +++ b/SPECS/caas-metrics_server.spec @@ -15,7 +15,7 @@ %define COMPONENT metrics_server %define RPM_NAME caas-%{COMPONENT} %define RPM_MAJOR_VERSION 0.3.3 -%define RPM_MINOR_VERSION 0 +%define RPM_MINOR_VERSION 1 %define DEPENDENCY_MANAGER_VERSION 0.5.0 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION} @@ -29,8 +29,8 @@ BuildArch: x86_64 Vendor: %{_platform_vendor} and kubernetes-incubator/metrics-server 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 metrics server container image for the CaaS subsystem. @@ -56,7 +56,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-prometheus.spec b/SPECS/caas-prometheus.spec index 2d84e83..d8ed79f 100644 --- a/SPECS/caas-prometheus.spec +++ b/SPECS/caas-prometheus.spec @@ -15,7 +15,7 @@ %define COMPONENT prometheus %define RPM_NAME caas-%{COMPONENT} %define RPM_MAJOR_VERSION 2.9.2 -%define RPM_MINOR_VERSION 0 +%define RPM_MINOR_VERSION 1 %define GO_VERSION 1.12.1 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION} @@ -29,8 +29,8 @@ BuildArch: x86_64 Vendor: %{_platform_vendor} and prometheus/prometheus 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 prometheus container image for the CaaS subsystem. @@ -56,7 +56,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