From 1e7705ab835a838f8985f9db68ba5d80fd9aecfe Mon Sep 17 00:00:00 2001 From: jialv01 Date: Thu, 18 Apr 2019 10:54:07 +0800 Subject: [PATCH] Add etcd&onos repo as submodule and support arm64 1.forked SEBA componants`s repo to IEC repo,include: beats-docker,etcd-operator-docker,etcd, onos 2.Add patch files inorder to aarch64 docker image support src/use_cases/seba_on_arm/docker/build/beats-docker/build.arm src/use_cases/seba_on_arm/docker/build/etcd-operator-docker/build.arm src/use_cases/seba_on_arm/docker/build/etcd/build.arm src/use_cases/seba_on_arm/docker/build/onos/build.arm src/use_cases/seba_on_arm/patches/beats-docker/0001-Correct-path-errors-and-tar-command-errors.patch Change-Id: I90ed064ef7264150d9c0d15312e6f2bb975e92e9 Signed-off-by: jialv01 --- .gitmodules | 14 ++++++++++ .../docker/build/beats-docker/build.arm | 11 ++++++++ .../docker/build/etcd-operator-docker/build.arm | 10 ++++++++ .../seba_on_arm/docker/build/etcd/build.arm | 11 ++++++++ .../seba_on_arm/docker/build/onos/build.arm | 10 ++++++++ ...orrect-path-errors-and-tar-command-errors.patch | 30 ++++++++++++++++++++++ src/use_cases/seba_on_arm/src_repo/beats-docker | 1 + src/use_cases/seba_on_arm/src_repo/etcd | 1 + .../seba_on_arm/src_repo/etcd-operator-docker | 1 + src/use_cases/seba_on_arm/src_repo/onos | 1 + 10 files changed, 90 insertions(+) create mode 100755 src/use_cases/seba_on_arm/docker/build/beats-docker/build.arm create mode 100755 src/use_cases/seba_on_arm/docker/build/etcd-operator-docker/build.arm create mode 100755 src/use_cases/seba_on_arm/docker/build/etcd/build.arm create mode 100755 src/use_cases/seba_on_arm/docker/build/onos/build.arm create mode 100644 src/use_cases/seba_on_arm/patches/beats-docker/0001-Correct-path-errors-and-tar-command-errors.patch create mode 160000 src/use_cases/seba_on_arm/src_repo/beats-docker create mode 160000 src/use_cases/seba_on_arm/src_repo/etcd create mode 160000 src/use_cases/seba_on_arm/src_repo/etcd-operator-docker create mode 160000 src/use_cases/seba_on_arm/src_repo/onos diff --git a/.gitmodules b/.gitmodules index f35bd06..c4c869e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -121,3 +121,17 @@ path = src/use_cases/seba_on_arm/src_repo/voltha url = https://github.com/iecedge/voltha.git branch = jglr_move_to_cachengo_infra +[submodule "etcd-operator-docker"] + path = src/use_cases/seba_on_arm/src_repo/etcd-operator-docker + url = https://github.com/iecedge/etcd-operator-docker.git +[submodule "etcd"] + path = src/use_cases/seba_on_arm/src_repo/etcd + url = https://github.com/iecedge/etcd.git +[submodule "onos"] + path = src/use_cases/seba_on_arm/src_repo/onos + url = https://github.com/iecedge/onos.git + branch = v1.13.5 +[submodule "beats-docker"] + path = src/use_cases/seba_on_arm/src_repo/beats-docker + url = https://github.com/iecedge/beats-docker.git + branch = 6.4.2-arm64v8 diff --git a/src/use_cases/seba_on_arm/docker/build/beats-docker/build.arm b/src/use_cases/seba_on_arm/docker/build/beats-docker/build.arm new file mode 100755 index 0000000..6c8979e --- /dev/null +++ b/src/use_cases/seba_on_arm/docker/build/beats-docker/build.arm @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# This script builds the filebeat-oss docker image +set -o errexit +set -o xtrace + +#cd $BEATS-DOCKER_PATH + +#building filebeat-oss docker image +IMAGE_TAG=akrainoenea/filebeat ELASTIC_VERSION=6.4.2 IMAGE_FLAVORS=oss DEFAULT_IMAGE_FLAVOR=oss make filebeat +docker tag docker.elastic.co/beats/filebeat-oss:6.4.2 iecedge/filebeat-oss_arm64:6.4.2 diff --git a/src/use_cases/seba_on_arm/docker/build/etcd-operator-docker/build.arm b/src/use_cases/seba_on_arm/docker/build/etcd-operator-docker/build.arm new file mode 100755 index 0000000..f8e62af --- /dev/null +++ b/src/use_cases/seba_on_arm/docker/build/etcd-operator-docker/build.arm @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# This script builds the etcd-operator docker images +set -o errexit +set -o xtrace + +#cd $ETCD-OPERATOR-DOCKER_PATH + +#building etcd-operator docker images +docker build -t iecedge/etcd-operator_arm64:v0.9.2 . diff --git a/src/use_cases/seba_on_arm/docker/build/etcd/build.arm b/src/use_cases/seba_on_arm/docker/build/etcd/build.arm new file mode 100755 index 0000000..84b707f --- /dev/null +++ b/src/use_cases/seba_on_arm/docker/build/etcd/build.arm @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# This script builds the etcd docker image +set -o errexit +set -o xtrace + +#cd $ETCD_PATH + +#building etcd docker image +./scripts/build-docker v3.3.10 +docker tag quay.io/coreos/etcd:v3.3.10-arm64 iecedge/etcd_arm64:v3.3.10 diff --git a/src/use_cases/seba_on_arm/docker/build/onos/build.arm b/src/use_cases/seba_on_arm/docker/build/onos/build.arm new file mode 100755 index 0000000..9732ca4 --- /dev/null +++ b/src/use_cases/seba_on_arm/docker/build/onos/build.arm @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# This script builds the onos docker image +set -o errexit +set -o xtrace + +#cd $ONOS_PATH + +#building onos docker image +docker build -t iecedge/onos_arm64:v1.13.5 . diff --git a/src/use_cases/seba_on_arm/patches/beats-docker/0001-Correct-path-errors-and-tar-command-errors.patch b/src/use_cases/seba_on_arm/patches/beats-docker/0001-Correct-path-errors-and-tar-command-errors.patch new file mode 100644 index 0000000..a1ab567 --- /dev/null +++ b/src/use_cases/seba_on_arm/patches/beats-docker/0001-Correct-path-errors-and-tar-command-errors.patch @@ -0,0 +1,30 @@ +From f13d46ea72f5e0d9e8a43a10b19b9914ece25d02 Mon Sep 17 00:00:00 2001 +From: jialv01 +Date: Mon, 15 Apr 2019 21:29:50 +0800 +Subject: [PATCH] Correct path errors and tar command errors + +Correct path errors and tar command errors + +Signed-off-by: jialv01 +--- + templates/Dockerfile.j2 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/templates/Dockerfile.j2 b/templates/Dockerfile.j2 +index 9cdcb4a..31ed20b 100644 +--- a/templates/Dockerfile.j2 ++++ b/templates/Dockerfile.j2 +@@ -24,8 +24,8 @@ FROM centos:7 + + RUN yum update -y && yum install -y curl && yum clean all + +-COPY --from=golang /go/src/github.com/alexandruavadanii/beats/{{ beat }}/build/distributions/{{ beat }}-{{ elastic_version }}-linux-arm64.tar.gz /tmp +-RUN tar zxf /tmp/FIXME -C /tmp && \ ++COPY --from=golang /go/src/github.com/elastic/beats/{{ beat }}/build/distributions/{{ beat }}-{{ elastic_version }}-linux-arm64.tar.gz /tmp ++RUN tar zxf /tmp/{{ beat }}-{{ elastic_version }}-linux-arm64.tar.gz -C /tmp && \ + mv /tmp/{{ beat }}-{{ elastic_version }}-linux-arm64 {{ beat_home }} && \ + rm /tmp/{{ beat }}-{{ elastic_version }}-linux-arm64.tar.gz + +-- +2.17.1 + diff --git a/src/use_cases/seba_on_arm/src_repo/beats-docker b/src/use_cases/seba_on_arm/src_repo/beats-docker new file mode 160000 index 0000000..3ff5db2 --- /dev/null +++ b/src/use_cases/seba_on_arm/src_repo/beats-docker @@ -0,0 +1 @@ +Subproject commit 3ff5db2897a1254f1131fefe14eaa60049a8c0c3 diff --git a/src/use_cases/seba_on_arm/src_repo/etcd b/src/use_cases/seba_on_arm/src_repo/etcd new file mode 160000 index 0000000..27fc7e2 --- /dev/null +++ b/src/use_cases/seba_on_arm/src_repo/etcd @@ -0,0 +1 @@ +Subproject commit 27fc7e2296f506182f58ce846e48f36b34fe6842 diff --git a/src/use_cases/seba_on_arm/src_repo/etcd-operator-docker b/src/use_cases/seba_on_arm/src_repo/etcd-operator-docker new file mode 160000 index 0000000..fc5c9e7 --- /dev/null +++ b/src/use_cases/seba_on_arm/src_repo/etcd-operator-docker @@ -0,0 +1 @@ +Subproject commit fc5c9e7e20eef0d29fb706f651ae3096359039a9 diff --git a/src/use_cases/seba_on_arm/src_repo/onos b/src/use_cases/seba_on_arm/src_repo/onos new file mode 160000 index 0000000..187e13d --- /dev/null +++ b/src/use_cases/seba_on_arm/src_repo/onos @@ -0,0 +1 @@ +Subproject commit 187e13d77773ea76f146458dd4702f0ea86c9cd3 -- 2.16.6