From aedccacc5911ad18137215b61a0bc4ce9da3aaa4 Mon Sep 17 00:00:00 2001 From: Balazs Szekeres Date: Thu, 3 Oct 2019 12:49:58 +0200 Subject: [PATCH] Metrics server to 0.3.5, Prometheus to 2.13.0 Go 1.13 update needed for prometheus. Go 1.13.1 was used because of CVE-2019-16276 Vulnerability fix. Change-Id: I9b38f3102b50dbe8d4950678f80b9a98e40c7ec0 Signed-off-by: Balazs Szekeres --- SPECS/caas-metrics_server.spec | 4 ++-- SPECS/caas-prometheus.spec | 6 +++--- docker-build/prometheus/Dockerfile | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/SPECS/caas-metrics_server.spec b/SPECS/caas-metrics_server.spec index 52c8cd1..fc6cdf6 100644 --- a/SPECS/caas-metrics_server.spec +++ b/SPECS/caas-metrics_server.spec @@ -14,8 +14,8 @@ %define COMPONENT metrics_server %define RPM_NAME caas-%{COMPONENT} -%define RPM_MAJOR_VERSION 0.3.3 -%define RPM_MINOR_VERSION 4 +%define RPM_MAJOR_VERSION 0.3.5 +%define RPM_MINOR_VERSION 0 %define go_version 1.12.10 %define DEP_MAN_VERSION 0.5.4 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION} diff --git a/SPECS/caas-prometheus.spec b/SPECS/caas-prometheus.spec index 34d1958..6d1d38d 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.11.1 -%define RPM_MINOR_VERSION 3 -%define go_version 1.12.10 +%define RPM_MAJOR_VERSION 2.13.0 +%define RPM_MINOR_VERSION 0 +%define go_version 1.13.1 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION} Name: %{RPM_NAME} diff --git a/docker-build/prometheus/Dockerfile b/docker-build/prometheus/Dockerfile index 22f0bb6..941636b 100644 --- a/docker-build/prometheus/Dockerfile +++ b/docker-build/prometheus/Dockerfile @@ -31,6 +31,7 @@ RUN apk add --no-cache --virtual .build-deps build-base go godep curl tar git ba && make build \ && mv prometheus /bin/prometheus \ && mv promtool /bin/promtool \ +&& mv tsdb/tsdb /bin/tsdb \ && apk del .build-deps \ && rm -rf /build \ && rm -rf ${GOPATH} \ -- 2.16.6