From f52bec35549383fafbcc5dae5b599db8523ef590 Mon Sep 17 00:00:00 2001 From: jialv01 Date: Thu, 4 Apr 2019 13:34:20 +0800 Subject: [PATCH] Add kafka repo as submodule add support arm64 1.forked SEBA componants`s repo to IEC repo,include: contrib,jmx-prometheus-exporter,kafka-prometheus-jmx-exporter,zookeeper_exporter 2.Add patch files inorder to aarch64 docker image support src/use_cases/seba_on_arm/docker/build/contrib/build.arm src/use_cases/seba_on_arm/docker/build/jmx-prometheus-exporter/build.arm src/use_cases/seba_on_arm/docker/build/kafka-prometheus-jmx-exporter/build.arm src/use_cases/seba_on_arm/docker/build/zookeeper_exporter/build.arm src/use_cases/seba_on_arm/patches/kafka-prometheus-jmx-exporter/0001-Modify-the-URL-to-properly-download-kafka-bin.patch Change-Id: I3e3ee84896a079b75d765abc63ba699305bd10b1 Signed-off-by: jialv01 --- .gitmodules | 14 ++++++++++++ .../seba_on_arm/docker/build/contrib/build.arm | 11 +++++++++ .../docker/build/jmx-prometheus-exporter/build.arm | 10 +++++++++ .../build/kafka-prometheus-jmx-exporter/build.arm | 11 +++++++++ .../docker/build/zookeeper_exporter/build.arm | 10 +++++++++ ...fy-the-URL-to-properly-download-kafka-bin.patch | 26 ++++++++++++++++++++++ src/use_cases/seba_on_arm/src_repo/contrib | 1 + .../seba_on_arm/src_repo/jmx-prometheus-exporter | 1 + .../src_repo/kafka-prometheus-jmx-exporter | 1 + .../seba_on_arm/src_repo/zookeeper_exporter | 1 + 10 files changed, 86 insertions(+) create mode 100755 src/use_cases/seba_on_arm/docker/build/contrib/build.arm create mode 100755 src/use_cases/seba_on_arm/docker/build/jmx-prometheus-exporter/build.arm create mode 100755 src/use_cases/seba_on_arm/docker/build/kafka-prometheus-jmx-exporter/build.arm create mode 100755 src/use_cases/seba_on_arm/docker/build/zookeeper_exporter/build.arm create mode 100644 src/use_cases/seba_on_arm/patches/kafka-prometheus-jmx-exporter/0001-Modify-the-URL-to-properly-download-kafka-bin.patch create mode 160000 src/use_cases/seba_on_arm/src_repo/contrib create mode 160000 src/use_cases/seba_on_arm/src_repo/jmx-prometheus-exporter create mode 160000 src/use_cases/seba_on_arm/src_repo/kafka-prometheus-jmx-exporter create mode 160000 src/use_cases/seba_on_arm/src_repo/zookeeper_exporter diff --git a/.gitmodules b/.gitmodules index 917f06c..caca036 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,3 +8,17 @@ path = src/use_cases/seba_on_arm/src_repo/cp-docker-images url = https://github.com/iecedge/cp-docker-images.git branch = 4.1.2-post-arm64v8 +[submodule "kafka-prometheus-jmx-exporter"] + path = src/use_cases/seba_on_arm/src_repo/kafka-prometheus-jmx-exporter + url = https://github.com/iecedge/dockerfiles.git + branch = misc-dockerfiles +[submodule "contrib"] + path = src/use_cases/seba_on_arm/src_repo/contrib + url = https://github.com/iecedge/contrib.git +[submodule "zookeeper_exporter"] + path = src/use_cases/seba_on_arm/src_repo/zookeeper_exporter + url = https://github.com/iecedge/zookeeper_exporter.git + branch = v1.1.2-arm64v8 +[submodule "jmx-prometheus-exporter"] + path = src/use_cases/seba_on_arm/src_repo/jmx-prometheus-exporter + url = https://github.com/iecedge/docker-jmx-prometheus-exporter.git diff --git a/src/use_cases/seba_on_arm/docker/build/contrib/build.arm b/src/use_cases/seba_on_arm/docker/build/contrib/build.arm new file mode 100755 index 0000000..d8bfa89 --- /dev/null +++ b/src/use_cases/seba_on_arm/docker/build/contrib/build.arm @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# This script builds the k8szk docker image +set -o errexit +set -o xtrace + +#cd $K8SZK_PATH + +#Build Docker Image +cd statefulsets/zookeeper/ +docker build -t iecedge/k8szk_arm64:v3 . diff --git a/src/use_cases/seba_on_arm/docker/build/jmx-prometheus-exporter/build.arm b/src/use_cases/seba_on_arm/docker/build/jmx-prometheus-exporter/build.arm new file mode 100755 index 0000000..8595a3f --- /dev/null +++ b/src/use_cases/seba_on_arm/docker/build/jmx-prometheus-exporter/build.arm @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# This script builds the jmx-prometheus-exporter docker image +set -o errexit +set -o xtrace + +#cd $JMX-PROMETHEUS-EXPORTER_PATH + +#Build Docker Image +docker build -t iecedge/jmx-prometheus-exporter_arm64:master . diff --git a/src/use_cases/seba_on_arm/docker/build/kafka-prometheus-jmx-exporter/build.arm b/src/use_cases/seba_on_arm/docker/build/kafka-prometheus-jmx-exporter/build.arm new file mode 100755 index 0000000..ba526d9 --- /dev/null +++ b/src/use_cases/seba_on_arm/docker/build/kafka-prometheus-jmx-exporter/build.arm @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# This script builds the kafka-prometheus-jmx docker image +set -o errexit +set -o xtrace + +#cd $KAFKA-PROMETHEUS-JMX_PATH + +#Build Docker Image +cd kafka +docker build -t iecedge/kafka-prometheus-jmx-exporter_arm64:misc-dockerfiles . diff --git a/src/use_cases/seba_on_arm/docker/build/zookeeper_exporter/build.arm b/src/use_cases/seba_on_arm/docker/build/zookeeper_exporter/build.arm new file mode 100755 index 0000000..2271619 --- /dev/null +++ b/src/use_cases/seba_on_arm/docker/build/zookeeper_exporter/build.arm @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# This script builds the zookeeper_exporter docker image +set -o errexit +set -o xtrace + +#cd $ZOOKEEPER_EXPORTER_PATH + +#Build Docker Image +docker build -t iecedge/zookeeper-exporter_arm64:master . diff --git a/src/use_cases/seba_on_arm/patches/kafka-prometheus-jmx-exporter/0001-Modify-the-URL-to-properly-download-kafka-bin.patch b/src/use_cases/seba_on_arm/patches/kafka-prometheus-jmx-exporter/0001-Modify-the-URL-to-properly-download-kafka-bin.patch new file mode 100644 index 0000000..08068e9 --- /dev/null +++ b/src/use_cases/seba_on_arm/patches/kafka-prometheus-jmx-exporter/0001-Modify-the-URL-to-properly-download-kafka-bin.patch @@ -0,0 +1,26 @@ +From 6be92d42b8239bbeb69882a4992138c075a47b00 Mon Sep 17 00:00:00 2001 +From: jialv01 +Date: Thu, 28 Mar 2019 16:52:48 +0800 +Subject: [PATCH] Modify the URL to properly download kafka bin + +Signed-off-by: jialv01 +--- + kafka/Dockerfile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kafka/Dockerfile b/kafka/Dockerfile +index 4d43b54..19782bb 100644 +--- a/kafka/Dockerfile ++++ b/kafka/Dockerfile +@@ -5,7 +5,7 @@ ENV kafka_bin_version=2.12-$kafka_version + + RUN apk add --no-cache --update-cache --virtual build-dependencies curl ca-certificates \ + && mkdir -p /opt/kafka \ +- && curl -SLs "https://www-eu.apache.org/dist/kafka/$kafka_version/kafka_$kafka_bin_version.tgz" | tar -xzf - --strip-components=1 -C /opt/kafka \ ++ && curl -SLs "https://archive.apache.org/dist/kafka/$kafka_version/kafka_$kafka_bin_version.tgz" |tar -xzf - --strip-components=1 -C /opt/kafka \ + && apk del build-dependencies \ + && rm -rf /var/cache/apk/* + +-- +2.17.1 + diff --git a/src/use_cases/seba_on_arm/src_repo/contrib b/src/use_cases/seba_on_arm/src_repo/contrib new file mode 160000 index 0000000..b72fa50 --- /dev/null +++ b/src/use_cases/seba_on_arm/src_repo/contrib @@ -0,0 +1 @@ +Subproject commit b72fa5059d8ce9de234b65c392dc03bca8a73be4 diff --git a/src/use_cases/seba_on_arm/src_repo/jmx-prometheus-exporter b/src/use_cases/seba_on_arm/src_repo/jmx-prometheus-exporter new file mode 160000 index 0000000..7996bf1 --- /dev/null +++ b/src/use_cases/seba_on_arm/src_repo/jmx-prometheus-exporter @@ -0,0 +1 @@ +Subproject commit 7996bf137b07d019bb370acb6300f244d6fde3f5 diff --git a/src/use_cases/seba_on_arm/src_repo/kafka-prometheus-jmx-exporter b/src/use_cases/seba_on_arm/src_repo/kafka-prometheus-jmx-exporter new file mode 160000 index 0000000..a595dcf --- /dev/null +++ b/src/use_cases/seba_on_arm/src_repo/kafka-prometheus-jmx-exporter @@ -0,0 +1 @@ +Subproject commit a595dcf74a0d7161a9c6bdf8858090bfc2411642 diff --git a/src/use_cases/seba_on_arm/src_repo/zookeeper_exporter b/src/use_cases/seba_on_arm/src_repo/zookeeper_exporter new file mode 160000 index 0000000..972e0da --- /dev/null +++ b/src/use_cases/seba_on_arm/src_repo/zookeeper_exporter @@ -0,0 +1 @@ +Subproject commit 972e0da376355b6ecfbfb6266aa730346baca974 -- 2.16.6