Code Review
/
ta
/
caas-danm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Configurable flannel cidr introduction
[ta/caas-danm.git]
/
SPECS
/
caas-flannel.spec
diff --git
a/SPECS/caas-flannel.spec
b/SPECS/caas-flannel.spec
index
fe09afa
..
31273c2
100644
(file)
--- a/
SPECS/caas-flannel.spec
+++ b/
SPECS/caas-flannel.spec
@@
-15,7
+15,7
@@
%define COMPONENT flannel
%define RPM_NAME caas-%{COMPONENT}
%define RPM_MAJOR_VERSION 0.11.0
%define COMPONENT flannel
%define RPM_NAME caas-%{COMPONENT}
%define RPM_MAJOR_VERSION 0.11.0
-%define RPM_MINOR_VERSION
1
+%define RPM_MINOR_VERSION
8
%define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
Name: %{RPM_NAME}
%define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
Name: %{RPM_NAME}
@@
-28,8
+28,8
@@
BuildArch: x86_64
Vendor: %{_platform_vendor} and coreos/flannel unmodified
Source0: %{name}-%{version}.tar.gz
Vendor: %{_platform_vendor} and coreos/flannel 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 Flannel container image, and related deployment artifacts for the CaaS subsystem.
%description
This RPM contains the Flannel container image, and related deployment artifacts for the CaaS subsystem.
@@
-55,7
+55,7
@@
docker build \
mkdir -p %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save/
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}