Code Review
/
ta
/
caas-metrics.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Go updated to 1.12.9
[ta/caas-metrics.git]
/
SPECS
/
caas-prometheus.spec
diff --git
a/SPECS/caas-prometheus.spec
b/SPECS/caas-prometheus.spec
index
ac1fa76
..
e5d86db
100644
(file)
--- a/
SPECS/caas-prometheus.spec
+++ b/
SPECS/caas-prometheus.spec
@@
-15,8
+15,8
@@
%define COMPONENT prometheus
%define RPM_NAME caas-%{COMPONENT}
%define RPM_MAJOR_VERSION 2.11.1
%define COMPONENT prometheus
%define RPM_NAME caas-%{COMPONENT}
%define RPM_MAJOR_VERSION 2.11.1
-%define RPM_MINOR_VERSION
0
-%define
GO_VERSION 1.12.1
+%define RPM_MINOR_VERSION
1
+%define
go_version 1.12.9
%define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
Name: %{RPM_NAME}
%define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
Name: %{RPM_NAME}
@@
-49,8
+49,8
@@
docker build \
--build-arg http_proxy="${http_proxy}" \
--build-arg https_proxy="${https_proxy}" \
--build-arg no_proxy="${no_proxy}" \
--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}/
--tag %{COMPONENT}:%{IMAGE_TAG} \
%{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build/%{COMPONENT}/