This is an automated email from the ASF dual-hosted git repository.
jshao pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/gravitino.git
The following commit(s) were added to refs/heads/main by this push:
new 2a29685234 [#7165] feat(docker): move jar downloading from init script
to image build process (#7164)
2a29685234 is described below
commit 2a296852346a019c56c6fa0535fafdeb2b95a427
Author: FANNG <[email protected]>
AuthorDate: Sat Jun 7 02:03:10 2025 +0800
[#7165] feat(docker): move jar downloading from init script to image build
process (#7164)
### What changes were proposed in this pull request?
move jar downloading from init script to image build process
### Why are the changes needed?
Fix: #7165
### Does this PR introduce _any_ user-facing change?
no
### How was this patch tested?
build an local image
---
dev/charts/gravitino/resources/config/init.sh | 12 --------
dev/docker/gravitino/gravitino-dependency.sh | 41 ++++++++++++++++++++++++++-
2 files changed, 40 insertions(+), 13 deletions(-)
diff --git a/dev/charts/gravitino/resources/config/init.sh
b/dev/charts/gravitino/resources/config/init.sh
index 7910829c4e..a91f20cacb 100644
--- a/dev/charts/gravitino/resources/config/init.sh
+++ b/dev/charts/gravitino/resources/config/init.sh
@@ -18,18 +18,6 @@
# under the License.
#
-echo "Start to download the jar package of JDBC"
-wget
https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.27/mysql-connector-java-8.0.27.jar
-O ${GRAVITINO_HOME}/catalogs/jdbc-mysql/libs/mysql-connector-java-8.0.27.jar
-wget https://jdbc.postgresql.org/download/postgresql-42.7.0.jar -O
${GRAVITINO_HOME}/catalogs/jdbc-postgresql/libs/postgresql-42.7.0.jar
-
-cp ${GRAVITINO_HOME}/catalogs/jdbc-postgresql/libs/postgresql-42.7.0.jar
${GRAVITINO_HOME}/catalogs/lakehouse-iceberg/libs
-cp ${GRAVITINO_HOME}/catalogs/jdbc-mysql/libs/mysql-connector-java-8.0.27.jar
${GRAVITINO_HOME}/catalogs/lakehouse-iceberg/libs
-
-cp ${GRAVITINO_HOME}/catalogs/jdbc-postgresql/libs/postgresql-42.7.0.jar
${GRAVITINO_HOME}/iceberg-rest-server/libs
-cp ${GRAVITINO_HOME}/catalogs/jdbc-mysql/libs/mysql-connector-java-8.0.27.jar
${GRAVITINO_HOME}/iceberg-rest-server/libs
-
-cp ${GRAVITINO_HOME}/catalogs/jdbc-mysql/libs/mysql-connector-java-8.0.27.jar
${GRAVITINO_HOME}/libs
-echo "Finish downloading"
cp /tmp/conf/* ${GRAVITINO_HOME}/conf
cp /tmp/conf/log4j2.properties ${GRAVITINO_HOME}/conf
diff --git a/dev/docker/gravitino/gravitino-dependency.sh
b/dev/docker/gravitino/gravitino-dependency.sh
index 3393658c96..27b99749da 100755
--- a/dev/docker/gravitino/gravitino-dependency.sh
+++ b/dev/docker/gravitino/gravitino-dependency.sh
@@ -21,6 +21,9 @@ set -ex
gravitino_dir="$(dirname "${BASH_SOURCE-$0}")"
gravitino_dir="$(cd "${gravitino_dir}">/dev/null; pwd)"
gravitino_home="$(cd "${gravitino_dir}/../../..">/dev/null; pwd)"
+gravitino_package_dir="${gravitino_dir}/packages/gravitino"
+gravitino_staging_dir="${gravitino_package_dir}/staging"
+gravitino_iceberg_rest_dir="${gravitino_package_dir}/iceberg-rest-server/libs/"
# Build the Gravitino project
${gravitino_home}/gradlew clean build -x test
@@ -33,7 +36,38 @@ ${gravitino_home}/gradlew compileDistribution -x test
rm -rf "${gravitino_dir}/packages"
mkdir -p "${gravitino_dir}/packages"
-cp -r "${gravitino_home}/distribution/package"
"${gravitino_dir}/packages/gravitino"
+cp -r "${gravitino_home}/distribution/package" "${gravitino_package_dir}"
+mkdir -p "${gravitino_staging_dir}"
+
+echo "Start to download the jar package"
+
+mysql_driver="mysql-connector-java-8.0.27.jar"
+wget
"https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.27/$mysql_driver";
-O "${gravitino_staging_dir}/${mysql_driver}"
+cp "${gravitino_staging_dir}/${mysql_driver}"
"${gravitino_package_dir}/catalogs/jdbc-mysql/libs/"
+cp "${gravitino_staging_dir}/${mysql_driver}"
"${gravitino_package_dir}/catalogs/lakehouse-iceberg/libs/"
+cp "${gravitino_staging_dir}/${mysql_driver}" "${gravitino_iceberg_rest_dir}"
+cp "${gravitino_staging_dir}/${mysql_driver}" "${gravitino_package_dir}/libs/"
+
+pg_driver="postgresql-42.7.0.jar"
+wget "https://jdbc.postgresql.org/download/${pg_driver}"; -O
"${gravitino_staging_dir}/${pg_driver}"
+cp "${gravitino_staging_dir}/${pg_driver}"
"${gravitino_package_dir}/catalogs/jdbc-postgresql/libs/"
+cp "${gravitino_staging_dir}/${pg_driver}"
"${gravitino_package_dir}/catalogs/lakehouse-iceberg/libs/"
+cp "${gravitino_staging_dir}/${pg_driver}" "${gravitino_iceberg_rest_dir}"
+
+iceberg_version="1.6.1"
+iceberg_aws_bundle="iceberg-aws-bundle-${iceberg_version}.jar"
+wget
"https://repo1.maven.org/maven2/org/apache/iceberg/iceberg-aws-bundle/${iceberg_version}/${iceberg_aws_bundle}";
-O "${gravitino_staging_dir}/${iceberg_aws_bundle}"
+cp "${gravitino_staging_dir}/${iceberg_aws_bundle}"
"${gravitino_iceberg_rest_dir}"
+
+iceberg_gcp_bundle="iceberg-gcp-bundle-${iceberg_version}.jar"
+wget
"https://repo1.maven.org/maven2/org/apache/iceberg/iceberg-gcp-bundle/${iceberg_version}/${iceberg_gcp_bundle}";
-O "${gravitino_staging_dir}/${iceberg_gcp_bundle}"
+cp "${gravitino_staging_dir}/${iceberg_gcp_bundle}"
"${gravitino_iceberg_rest_dir}"
+
+iceberg_azure_bundle="iceberg-azure-bundle-${iceberg_version}.jar"
+wget
"https://repo1.maven.org/maven2/org/apache/iceberg/iceberg-azure-bundle/${iceberg_version}/${iceberg_azure_bundle}";
-O "${gravitino_staging_dir}/${iceberg_azure_bundle}"
+cp "${gravitino_staging_dir}/${iceberg_azure_bundle}"
"${gravitino_iceberg_rest_dir}"
+
+echo "Finish downloading"
mkdir -p "${gravitino_dir}/packages/gravitino/bin"
cp "${gravitino_dir}/rewrite_gravitino_server_config.py"
"${gravitino_dir}/packages/gravitino/bin/"
@@ -45,6 +79,11 @@ cp ${gravitino_home}/bundles/aws-bundle/build/libs/*.jar
"${gravitino_dir}/packa
cp ${gravitino_home}/bundles/gcp-bundle/build/libs/*.jar
"${gravitino_dir}/packages/gravitino/catalogs/hadoop/libs"
cp ${gravitino_home}/bundles/azure-bundle/build/libs/*.jar
"${gravitino_dir}/packages/gravitino/catalogs/hadoop/libs"
+cp ${gravitino_home}/bundles/aws/build/libs/*.jar
"${gravitino_iceberg_rest_dir}"
+cp ${gravitino_home}/bundles/gcp/build/libs/*.jar
"${gravitino_iceberg_rest_dir}"
+cp ${gravitino_home}/bundles/azure/build/libs/*.jar
"${gravitino_iceberg_rest_dir}"
+cp ${gravitino_home}/bundles/aliyun-bundle/build/libs/*.jar
"${gravitino_iceberg_rest_dir}"
+
# Keeping the container running at all times
cat <<EOF >> "${gravitino_dir}/packages/gravitino/bin/gravitino.sh"
