Code Review
/
ta
/
caas-logging.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
3rd party component update
[ta/caas-logging.git]
/
SPECS
/
fluentd.spec
diff --git
a/SPECS/fluentd.spec
b/SPECS/fluentd.spec
index
99e3836
..
8df4110
100644
(file)
--- a/
SPECS/fluentd.spec
+++ b/
SPECS/fluentd.spec
@@
-14,7
+14,7
@@
%define COMPONENT fluentd
%define RPM_NAME caas-%{COMPONENT}
%define COMPONENT fluentd
%define RPM_NAME caas-%{COMPONENT}
-%define RPM_MAJOR_VERSION 1.
5.0
+%define RPM_MAJOR_VERSION 1.
6.3
%define RPM_MINOR_VERSION 0
%define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
%define RPM_MINOR_VERSION 0
%define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
@@
-28,8
+28,8
@@
BuildArch: x86_64
Vendor: %{_platform_vendor} and fluent/fluentd unmodified
Source0: %{name}-%{version}.tar.gz
Vendor: %{_platform_vendor} and fluent/fluentd 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 >= 18.09.2
, xz
%description
This RPM contains the Fluentd container image, and related deployment artifacts for the CaaS subsystem.
%description
This RPM contains the Fluentd container image, and related deployment artifacts for the CaaS subsystem.
@@
-54,7
+54,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}
@@
-62,27
+62,10
@@
docker rmi -f %{COMPONENT}:%{IMAGE_TAG}
mkdir -p %{buildroot}/%{_caas_container_tar_path}/
rsync -av %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save/%{COMPONENT}:%{IMAGE_TAG}.tar %{buildroot}/%{_caas_container_tar_path}/
mkdir -p %{buildroot}/%{_caas_container_tar_path}/
rsync -av %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save/%{COMPONENT}:%{IMAGE_TAG}.tar %{buildroot}/%{_caas_container_tar_path}/
-mkdir -p %{buildroot}/%{_playbooks_path}/
-rsync -av ansible/playbooks/fluentd.yaml %{buildroot}/%{_playbooks_path}/
-
-mkdir -p %{buildroot}/%{_roles_path}/
-rsync -av ansible/roles/fluentd %{buildroot}/%{_roles_path}/
-
%files
%{_caas_container_tar_path}/%{COMPONENT}:%{IMAGE_TAG}.tar
%files
%{_caas_container_tar_path}/%{COMPONENT}:%{IMAGE_TAG}.tar
-%{_playbooks_path}/fluentd.yaml
-%{_roles_path}/fluentd
%preun
%preun
-
%post
%post
-mkdir -p %{_postconfig_path}/
-ln -sf %{_playbooks_path}/fluentd.yaml %{_postconfig_path}/
-
-%postun
-if [ $1 -eq 0 ]; then
- rm -f %{_postconfig_path}/fluentd.yaml
-fi
-
%clean
rm -rf ${buildroot}
%clean
rm -rf ${buildroot}