X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=SPECS%2Fcaas-prometheus.spec;h=4a0a3be523dcebc13a6a7e1c5f762a1a743d2020;hb=HEAD;hp=13b20e832b5ad58f3b2e1474150077fc7525a068;hpb=ebeb612744335ffce22a9e58b8769a99e30f068f;p=ta%2Fcaas-metrics.git diff --git a/SPECS/caas-prometheus.spec b/SPECS/caas-prometheus.spec index 13b20e8..4a0a3be 100644 --- a/SPECS/caas-prometheus.spec +++ b/SPECS/caas-prometheus.spec @@ -14,9 +14,9 @@ %define COMPONENT prometheus %define RPM_NAME caas-%{COMPONENT} -%define RPM_MAJOR_VERSION 2.8.1 -%define RPM_MINOR_VERSION 1 -%define GO_VERSION 1.11.4 +%define RPM_MAJOR_VERSION 2.13.1 +%define RPM_MINOR_VERSION 0 +%define go_version 1.13.1 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION} Name: %{RPM_NAME} @@ -25,12 +25,12 @@ Release: %{RPM_MINOR_VERSION}%{?dist} Summary: Containers as a Service Prometheus component License: %{_platform_license} and BSD and Apache License and MIT license and Mozilla Public License and Lesser General Public License and GNU General Public License v2.0 only URL: https://github.com/prometheus/prometheus -BuildArch: x86_64 +BuildArch: %{_arch} 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. @@ -49,14 +49,14 @@ docker build \ --build-arg http_proxy="${http_proxy}" \ --build-arg https_proxy="${https_proxy}" \ --build-arg no_proxy="${no_proxy}" \ - --build-arg PROMETHEUS="%{RPM_MAJOR_VERSION}" \ - --build-arg GO_REQUIRED="%{GO_VERSION}" \ + --build-arg PROMETHEUS_VERSION="%{RPM_MAJOR_VERSION}" \ + --build-arg go_version="%{go_version}" \ --tag %{COMPONENT}:%{IMAGE_TAG} \ %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build/%{COMPONENT}/ 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}