This is an automated email from the ASF dual-hosted git repository.
wangdan pushed a commit to branch fix-github-zk-hadoop
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
The following commit(s) were added to refs/heads/fix-github-zk-hadoop by this
push:
new 2ecebb029 fix download hadoop/zk
2ecebb029 is described below
commit 2ecebb0294f3716e2513875396e9ce1e23044b59
Author: Dan Wang <[email protected]>
AuthorDate: Thu Oct 17 22:53:33 2024 +0800
fix download hadoop/zk
---
.github/workflows/thirdparty-regular-push.yml | 6 ++++++
admin_tools/download_hadoop.sh | 11 +++++++----
admin_tools/download_package.sh | 9 ++-------
admin_tools/download_zk.sh | 7 +++++--
docker/thirdparties-bin/Dockerfile | 4 ++--
5 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/.github/workflows/thirdparty-regular-push.yml
b/.github/workflows/thirdparty-regular-push.yml
index 844de5cc0..6ce68aae1 100644
--- a/.github/workflows/thirdparty-regular-push.yml
+++ b/.github/workflows/thirdparty-regular-push.yml
@@ -73,6 +73,8 @@ jobs:
build-args: |
GITHUB_BRANCH=${{ github.ref_name }}
OS_VERSION=${{ matrix.osversion }}
+ HADOOP_BIN_PATH=hadoop-bin
+ ZOOKEEPER_BIN_PATH=zookeeper-bin
build_push_bin_docker_images:
runs-on: ubuntu-latest
@@ -116,6 +118,8 @@ jobs:
build-args: |
GITHUB_BRANCH=${{ github.ref_name }}
OS_VERSION=${{ matrix.osversion }}
+ HADOOP_BIN_PATH=hadoop-bin
+ ZOOKEEPER_BIN_PATH=zookeeper-bin
build_push_bin_jemalloc_docker_images:
runs-on: ubuntu-latest
@@ -160,6 +164,8 @@ jobs:
GITHUB_BRANCH=${{ github.ref_name }}
OS_VERSION=${{ matrix.osversion }}
USE_JEMALLOC=ON
+ HADOOP_BIN_PATH=hadoop-bin
+ ZOOKEEPER_BIN_PATH=zookeeper-bin
build_push_bin_test_docker_images:
runs-on: ubuntu-latest
diff --git a/admin_tools/download_hadoop.sh b/admin_tools/download_hadoop.sh
index d90fd24f4..892b4d6b1 100755
--- a/admin_tools/download_hadoop.sh
+++ b/admin_tools/download_hadoop.sh
@@ -21,15 +21,18 @@ set -e
CWD=$(cd "$(dirname "$0")" && pwd)
-if [ $# -ge 1 ]; then
- HADOOP_BIN_PATH=$1
+if [ $# -lt 1 ]; then
+ echo "Invalid arguments !"
+ echo "USAGE: $0 <HADOOP_BIN_PATH>"
fi
+HADOOP_BIN_PATH=$1
+
HADOOP_VERSION="hadoop-3.3.6"
arch_output=$(arch)
if [ "$arch_output"x == "aarch64"x ]; then
- HADOOP_PACKAGE_MD5="369f899194a920e0d1c3c3bc1718b3b5"
- HADOOP_BASE_NAME=${HADOOP_VERSION}-"$(arch)"
+ HADOOP_PACKAGE_MD5="369f899194a920e0d1c3c3bc1718b3b5"
+ HADOOP_BASE_NAME=${HADOOP_VERSION}-"$(arch)"
else
if [ "$arch_output"x != "x86_64"x ]; then
echo "WARNING: unrecognized CPU architecture '$arch_output', use
'x86_64' as default"
diff --git a/admin_tools/download_package.sh b/admin_tools/download_package.sh
index 77e813eee..8c0453269 100755
--- a/admin_tools/download_package.sh
+++ b/admin_tools/download_package.sh
@@ -19,20 +19,15 @@
set -e
-if [ $# -lt 2 ]; then
+if [ $# -lt 3 ]; then
echo "Invalid arguments !"
- echo "USAGE: $0 <PACKAGE_BASE_NAME> <PACKAGE_MD5> [TARGET_PATH]"
+ echo "USAGE: $0 <PACKAGE_BASE_NAME> <PACKAGE_MD5> <TARGET_PATH>"
exit 1
fi
PACKAGE_BASE_NAME=$1
PACKAGE_MD5=$2
-if [ $# -lt 3 ]; then
- echo "TARGET_PATH is not provided, thus do not try to download
${PACKAGE_BASE_NAME}"
- exit 0
-fi
-
TARGET_PATH=$3
if [ -d "${TARGET_PATH}" ]; then
echo "TARGET_PATH ${TARGET_PATH} has existed, thus do not try to download
${PACKAGE_BASE_NAME}"
diff --git a/admin_tools/download_zk.sh b/admin_tools/download_zk.sh
index 41922452a..7f0823c74 100755
--- a/admin_tools/download_zk.sh
+++ b/admin_tools/download_zk.sh
@@ -21,10 +21,13 @@ set -e
CWD=$(cd $(dirname $0) && pwd)
-if [ $# -ge 1 ]; then
- ZOOKEEPER_BIN_PATH=$1
+if [ $# -lt 1 ]; then
+ echo "Invalid arguments !"
+ echo "USAGE: $0 <ZOOKEEPER_BIN_PATH>"
fi
+ZOOKEEPER_BIN_PATH=$1
+
ZOOKEEPER_VERSION=3.7.0
ZOOKEEPER_DIR_NAME=apache-zookeeper-${ZOOKEEPER_VERSION}-bin
ZOOKEEPER_PACKAGE_MD5="8ffa97e7e6b0b2cf1d022e5156a7561a"
diff --git a/docker/thirdparties-bin/Dockerfile
b/docker/thirdparties-bin/Dockerfile
index 70fb5eb45..438669f93 100644
--- a/docker/thirdparties-bin/Dockerfile
+++ b/docker/thirdparties-bin/Dockerfile
@@ -28,8 +28,8 @@ ARG GITHUB_BRANCH
ARG GITHUB_REPOSITORY_URL=https://github.com/apache/incubator-pegasus.git
ARG ROCKSDB_PORTABLE=native
ARG USE_JEMALLOC=OFF
-ARG HADOOP_BIN_PATH
-ARG ZOOKEEPER_BIN_PATH
+ARG HADOOP_BIN_PATH=hadoop-bin
+ARG ZOOKEEPER_BIN_PATH=zookeeper-bin
RUN git clone --depth=1 --branch=${GITHUB_BRANCH} ${GITHUB_REPOSITORY_URL} \
&& cd incubator-pegasus/thirdparty \
&& unzip /root/thirdparties-src.zip -d . \
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
