%define COMPONENT etcd
%define RPM_NAME caas-%{COMPONENT}
-%define RPM_MAJOR_VERSION 3.3.12
-%define RPM_MINOR_VERSION 1
+%define RPM_MAJOR_VERSION 3.4.0
+%define RPM_MINOR_VERSION 0
+%define go_version 1.12.9
%define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
%define docker_build_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build
%define docker_save_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save
Summary: Containers as a Service %{COMPONENT} component
License: %{_platform_license} and MIT license and BSD and Apache License and Lesser General Public License
URL: https://github.com/etcd-io/etcd
-BuildArch: x86_64
+BuildArch: %{_arch}
Vendor: %{_platform_vendor} and etcd-io/etcd unmodified
Source0: %{name}-%{version}.tar.gz
-Requires: docker-ce >= 18.09.2
-BuildRequires: docker-ce-cli >= 18.09.2
+Requires: docker-ce >= 18.09.2, rsync
+BuildRequires: docker-ce-cli >= 18.09.2, xz
%description
This rpm contains the %{COMPONENT} container for CaaS subsystem.
--build-arg https_proxy="${https_proxy}" \
--build-arg no_proxy="${no_proxy}" \
--build-arg ETCD_VERSION="%{version}" \
+ --build-arg go_version="%{go_version}" \
--tag %{COMPONENT}:%{IMAGE_TAG} \
%{docker_build_dir}/%{COMPONENT}/
mkdir -p %{docker_save_dir}/
-docker save %{COMPONENT}:%{IMAGE_TAG} | gzip -c > %{docker_save_dir}/%{COMPONENT}:%{IMAGE_TAG}.tar
+docker save %{COMPONENT}:%{IMAGE_TAG} | xz -z -T2 > %{docker_save_dir}/%{COMPONENT}:%{IMAGE_TAG}.tar
docker rmi %{COMPONENT}:%{IMAGE_TAG}
-
%install
mkdir -p %{buildroot}/%{_caas_container_tar_path}
rsync -av %{docker_save_dir}/%{COMPONENT}:%{IMAGE_TAG}.tar %{buildroot}/%{_caas_container_tar_path}/