This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 8729ccb88 [INLONG-4673][Docker] Support for building Docker images for
the ARM architecture (#4675)
8729ccb88 is described below
commit 8729ccb88d0de9290a9b9d538a7ea027780c51cc
Author: lucaspeng12138 <[email protected]>
AuthorDate: Fri Jul 1 10:46:45 2022 +0800
[INLONG-4673][Docker] Support for building Docker images for the ARM
architecture (#4675)
---
docker/build-arm-docker-images.sh | 74 +++++++++++++++++++++++++++++++++++++++
inlong-sdk/sdk-common/pom.xml | 2 +-
2 files changed, 75 insertions(+), 1 deletion(-)
diff --git a/docker/build-arm-docker-images.sh
b/docker/build-arm-docker-images.sh
new file mode 100644
index 000000000..453405bd4
--- /dev/null
+++ b/docker/build-arm-docker-images.sh
@@ -0,0 +1,74 @@
+#!/usr/bin/env bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+SHELL_FOLDER=$(cd "$(dirname "$0")";pwd)
+
+cd ${SHELL_FOLDER}
+cd ..
+mvn clean install -DskipTests
+
+version=`awk
'/<version>[^<]+<\/version>/{i++}i==2{gsub(/<version>|<\/version>/,"",$1);print
$0;exit;}' pom.xml`
+tag=${version}-aarch64
+
+manager_dockerfile_path="inlong-manager/manager-docker/"
+agent_dockerfile_path="inlong-agent/agent-docker/"
+audit_dockerfile_path="inlong-audit/audit-docker/"
+dataproxy_dockerfile_path="inlong-dataproxy/dataproxy-docker/"
+tubemq_manager_dockerfile_path="inlong-tubemq/tubemq-docker/tubemq-manager/"
+
+manager_tarball_name="apache-inlong-manager-web-${version}-bin.tar.gz"
+agent_tarball_name="apache-inlong-agent-${version}-bin.tar.gz"
+audit_tarball_name="apache-inlong-audit-${version}-bin.tar.gz"
+dataproxy_tarball_name="apache-inlong-dataproxy-${version}-bin.tar.gz"
+dashboard_file_name="build"
+tubemq_manager_tarball_name="apache-inlong-tubemq-manager-${version}-bin.tar.gz"
+
+manager_tarball="inlong-manager/manager-web/target/${manager_tarball_name}"
+agent_tarball="inlong-agent/agent-release/target/${agent_tarball_name}"
+audit_tarball="inlong-audit/audit-release/target/${audit_tarball_name}"
+dataproxy_tarball="inlong-dataproxy/dataproxy-dist/target/${dataproxy_tarball_name}"
+tubemq_manager_tarball="inlong-tubemq/tubemq-manager/target/${tubemq_manager_tarball_name}"
+
+MANAGER_TARBALL="target/${manager_tarball_name}"
+DATAPROXY_TARBALL="target/${dataproxy_tarball_name}"
+AUDIT_TARBALL="target/${audit_tarball_name}"
+TUBEMQ_MANAGER_TARBALL="target/${tubemq_manager_tarball_name}"
+DASHBOARD_FILE="${dashboard_file_name}"
+AGENT_TARBALL="target/${agent_tarball_name}"
+
+cp ${manager_tarball} ${manager_dockerfile_path}/target/${manager_tarball_name}
+cp ${agent_tarball} ${agent_dockerfile_path}/target/${agent_tarball_name}
+cp ${audit_tarball} ${audit_dockerfile_path}/target/${audit_tarball_name}
+cp ${dataproxy_tarball}
${dataproxy_dockerfile_path}/target/${dataproxy_tarball_name}
+cp ${tubemq_manager_tarball}
${tubemq_manager_dockerfile_path}/target/${tubemq_manager_tarball_name}
+
+docker build -t inlong/manager:${tag} inlong-manager/manager-docker/
--build-arg MANAGER_TARBALL=${MANAGER_TARBALL}
+docker build -t inlong/dataproxy:${tag} inlong-dataproxy/dataproxy-docker/
--build-arg DATAPROXY_TARBALL=${DATAPROXY_TARBALL}
+docker build -t inlong/audit:${tag} inlong-audit/audit-docker/ --build-arg
AUDIT_TARBALL=${AUDIT_TARBALL}
+docker build -t inlong/tubemq-manager:${tag}
inlong-tubemq/tubemq-docker/tubemq-manager/ --build-arg
TUBEMQ_MANAGER_TARBALL=${TUBEMQ_MANAGER_TARBALL}
+docker build -t inlong/dashboard:${tag} inlong-dashboard/ --build-arg
DASHBOARD_FILE=${DASHBOARD_FILE}
+docker build -t inlong/agent:${tag} inlong-agent/agent-docker/ --build-arg
AGENT_TARBALL=${AGENT_TARBALL}
+
+docker tag inlong/manager:${tag} inlong/manager:latest-aarch64
+docker tag inlong/dataproxy:${tag} inlong/dataproxy:latest-aarch64
+docker tag inlong/audit:${tag} inlong/audit:latest-aarch64
+docker tag inlong/tubemq-manager:${tag} inlong/tubemq-manager:latest-aarch64
+docker tag inlong/dashboard:${tag} inlong/dashboard:latest-aarch64
+docker tag inlong/agent:${tag} inlong/agent:latest-aarch64
diff --git a/inlong-sdk/sdk-common/pom.xml b/inlong-sdk/sdk-common/pom.xml
index 31e5580f4..b766d68b4 100644
--- a/inlong-sdk/sdk-common/pom.xml
+++ b/inlong-sdk/sdk-common/pom.xml
@@ -55,7 +55,7 @@
<extensions>true</extensions>
<configuration>
<protoSourceRoot>${project.basedir}/src/main/proto</protoSourceRoot>
-
<protocArtifact>com.google.protobuf:protoc:2.5.0:exe:${os.detected.classifier}</protocArtifact>
+
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
</configuration>
<executions>
<execution>