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-metrics_server.spec
diff --git
a/SPECS/caas-metrics_server.spec
b/SPECS/caas-metrics_server.spec
index
f9a4a3f
..
c09b0dd
100644
(file)
--- a/
SPECS/caas-metrics_server.spec
+++ b/
SPECS/caas-metrics_server.spec
@@
-14,9
+14,10
@@
%define COMPONENT metrics_server
%define RPM_NAME caas-%{COMPONENT}
%define COMPONENT metrics_server
%define RPM_NAME caas-%{COMPONENT}
-%define RPM_MAJOR_VERSION 0.3.1
-%define RPM_MINOR_VERSION 1
-%define DEPENDENCY_MANAGER_VERSION 0.5.0
+%define RPM_MAJOR_VERSION 0.3.3
+%define RPM_MINOR_VERSION 2
+%define go_version 1.12.9
+%define DEP_MAN_VERSION 0.5.0
%define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
Name: %{RPM_NAME}
%define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
Name: %{RPM_NAME}
@@
-29,8
+30,8
@@
BuildArch: x86_64
Vendor: %{_platform_vendor} and kubernetes-incubator/metrics-server unmodified
Source0: %{name}-%{version}.tar.gz
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.
%description
This RPM contains the metrics server container image for the CaaS subsystem.
@@
-49,14
+50,15
@@
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 METRICS_SERVER="%{RPM_MAJOR_VERSION}" \
- --build-arg DEPENDENCY_MANAGER="%{DEPENDENCY_MANAGER_VERSION}" \
+ --build-arg METRICS_SERVER_VERSION="%{RPM_MAJOR_VERSION}" \
+ --build-arg DEP_MAN_VERSION="%{DEP_MAN_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/
--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}
docker rmi -f %{COMPONENT}:%{IMAGE_TAG}