From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Fri, 27 Sep 2019 23:06:27 +0000 (+0200)
Subject: AArch64 support
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fcaas-logging.git;a=commitdiff_plain;h=f0e0ff7d87fca007a03f476ce8a8a5d11d431177

AArch64 support

- spec: change hardcoded x86_64 arch to current platform arch;
- Dockerfile: Instead of pulling CentOS base images from dockerhub,
  create them from scratch from the official SIG-cloudinstance repo:
  http://artifacts.ci.centos.org/sig-cloudinstance/
- spec: Bump minor RPM version;

Co-authored-by: Jimmy Lafontaine Rivera <lafonj@gmail.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Change-Id: I2ade11226e2d0272409e9d88c2b7705a9dd72507
---

diff --git a/SPECS/elasticsearch.spec b/SPECS/elasticsearch.spec
index 45c19df..bd5f275 100644
--- a/SPECS/elasticsearch.spec
+++ b/SPECS/elasticsearch.spec
@@ -15,8 +15,9 @@
 %define COMPONENT elasticsearch
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 7.3.0
-%define RPM_MINOR_VERSION 1
+%define RPM_MINOR_VERSION 2
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
+%define centos_build 191001
 
 Name:           %{RPM_NAME}
 Version:        %{RPM_MAJOR_VERSION}
@@ -24,12 +25,12 @@ Release:        %{RPM_MINOR_VERSION}%{?dist}
 Summary:        Containers as a Service Elasticsearch component
 License:        %{_platform_license} and GNU General Public License v2.0 only and GNU Lesser General Public License v2.1 only and MIT license and BSD and Apache-2.0
 URL:            https://github.com/elastic/elasticsearch
-BuildArch:      x86_64
+BuildArch:      %{_arch}
 Vendor:         %{_platform_vendor} and elastic/elasticsearch unmodified
 Source0:        %{name}-%{version}.tar.gz
 
 Requires: docker-ce >= 18.09.2, rsync
-BuildRequires: docker-ce >= 18.09.2, xz
+BuildRequires: docker-ce >= 18.09.2, xz, wget
 
 %description
 This RPM contains the Elasticsearch container image for CaaS subsystem.
@@ -38,6 +39,7 @@ This RPM contains the Elasticsearch container image for CaaS subsystem.
 %autosetup
 
 %build
+wget --progress=dot:giga http://artifacts.ci.centos.org/sig-cloudinstance/centos-7-%{centos_build}/%{_arch}/centos-7-%{_arch}-docker.tar.xz -O %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build/%{COMPONENT}/centos-7-docker.tar.xz
 docker build \
   --network=host \
   --no-cache \
diff --git a/SPECS/fluentd.spec b/SPECS/fluentd.spec
index 8df4110..8ccdd15 100644
--- a/SPECS/fluentd.spec
+++ b/SPECS/fluentd.spec
@@ -24,7 +24,7 @@ Release:        %{RPM_MINOR_VERSION}%{?dist}
 Summary:        Containers as a Service Fluentd component
 License:        %{_platform_license} and MIT license and Apache License and BSD 3-clause New or Revised License and Ruby License and BSD and Mozilla Public License and BSD 3-clause New or Revised License
 URL:            https://github.com/fluent/fluentd
-BuildArch:      x86_64
+BuildArch:      %{_arch}
 Vendor:         %{_platform_vendor} and fluent/fluentd unmodified
 Source0:        %{name}-%{version}.tar.gz
 
diff --git a/docker-build/elasticsearch/Dockerfile b/docker-build/elasticsearch/Dockerfile
index 39f8ecb..ab6d209 100644
--- a/docker-build/elasticsearch/Dockerfile
+++ b/docker-build/elasticsearch/Dockerfile
@@ -12,7 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM centos:7.6.1810
+FROM scratch
+ADD centos-7-docker.tar.xz /
+CMD ["/bin/bash"]
 MAINTAINER Levente Kale <levente.kale@nokia.com>
 
 ARG VERSION