X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=SPECS%2Felasticsearch.spec;h=08c8022d880fa41ae34a274736cd1809cca5a440;hb=e4c698f4ece22b2fe2b212801b6d5597c91535e4;hp=b10d97271954ee65905fa9ac2f5295bbf7dfb9ba;hpb=229e54ec0c45ee7389247cf6cda79d31b303de85;p=ta%2Fcaas-logging.git diff --git a/SPECS/elasticsearch.spec b/SPECS/elasticsearch.spec index b10d972..08c8022 100644 --- a/SPECS/elasticsearch.spec +++ b/SPECS/elasticsearch.spec @@ -14,22 +14,23 @@ %define COMPONENT elasticsearch %define RPM_NAME caas-%{COMPONENT} -%define RPM_MAJOR_VERSION 6.7.0 -%define RPM_MINOR_VERSION 1 +%define RPM_MAJOR_VERSION 7.4.0 +%define RPM_MINOR_VERSION 0 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION} +%define centos_build 191001 Name: %{RPM_NAME} Version: %{RPM_MAJOR_VERSION} Release: %{RPM_MINOR_VERSION}%{?dist} Summary: Containers as a Service Elasticsearch component -License: %{_platform_license} and GNU General Public License v2.0 only and GNU Lesser General Public License v2.1 only and MIT license and BSD +License: %{_platform_license} and GNU General Public License v2.0 only and GNU Lesser General Public License v2.1 only and MIT license and BSD and Apache-2.0 URL: https://github.com/elastic/elasticsearch -BuildArch: x86_64 +BuildArch: %{_arch} 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, wget %description This RPM contains the Elasticsearch container image for CaaS subsystem. @@ -38,6 +39,7 @@ This RPM contains the Elasticsearch container image for CaaS subsystem. %autosetup %build +wget --progress=dot:giga http://artifacts.ci.centos.org/sig-cloudinstance/centos-7-%{centos_build}/%{_arch}/centos-7-%{_arch}-docker.tar.xz -O %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build/%{COMPONENT}/centos-7-docker.tar.xz docker build \ --network=host \ --no-cache \ @@ -54,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}