This is an automated email from the ASF dual-hosted git repository.
yuanzhou pushed a commit to branch branch-1.5
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/branch-1.5 by this push:
new 62aad8b983 [1.5] Fix code branch used for building docker images
(#11046)
62aad8b983 is described below
commit 62aad8b983478d5a2768aa86d19c93356fb44af7
Author: PHILO-HE <[email protected]>
AuthorDate: Fri Nov 7 19:22:00 2025 +0800
[1.5] Fix code branch used for building docker images (#11046)
---
dev/docker/Dockerfile.centos7-static-build | 2 +-
dev/docker/Dockerfile.centos8-dynamic-build | 2 +-
dev/docker/Dockerfile.centos8-static-build | 2 +-
dev/docker/Dockerfile.centos9-dynamic-build | 2 +-
dev/docker/Dockerfile.centos9-static-build | 2 +-
dev/docker/cudf/Dockerfile | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dev/docker/Dockerfile.centos7-static-build
b/dev/docker/Dockerfile.centos7-static-build
index e015dc5178..019ed59917 100644
--- a/dev/docker/Dockerfile.centos7-static-build
+++ b/dev/docker/Dockerfile.centos7-static-build
@@ -35,7 +35,7 @@ RUN set -ex; \
-e 's/mirror\.centos\.org/vault.centos.org/' \
/etc/yum.repos.d/CentOS-SCLo-scl-rh.repo; \
yum install -y git patch wget sudo java-1.8.0-openjdk-devel ccache; \
- git clone --depth=1 https://github.com/apache/incubator-gluten
/opt/gluten; \
+ git clone -b branch-1.5 --depth=1
https://github.com/apache/incubator-gluten /opt/gluten; \
echo "check_certificate = off" >> ~/.wgetrc; \
cd /opt/gluten && bash ./dev/vcpkg/setup-build-depends.sh; \
mkdir -p ${VCPKG_PATH}; \
diff --git a/dev/docker/Dockerfile.centos8-dynamic-build
b/dev/docker/Dockerfile.centos8-dynamic-build
index 04d5da8571..96a6c1b168 100644
--- a/dev/docker/Dockerfile.centos8-dynamic-build
+++ b/dev/docker/Dockerfile.centos8-dynamic-build
@@ -45,7 +45,7 @@ RUN set -ex; \
wget -nv
https://archive.apache.org/dist/celeborn/celeborn-0.6.0/apache-celeborn-0.6.0-bin.tgz
-P /opt/; \
wget -nv
https://archive.apache.org/dist/incubator/uniffle/0.9.2/apache-uniffle-0.9.2-incubating-bin.tar.gz
-P /opt/; \
wget -nv
https://archive.apache.org/dist/hadoop/common/hadoop-2.8.5/hadoop-2.8.5.tar.gz
-P /opt/; \
- git clone --depth=1 https://github.com/apache/incubator-gluten
/opt/gluten; \
+ git clone -b branch-1.5 --depth=1
https://github.com/apache/incubator-gluten /opt/gluten; \
cd /opt/gluten/.github/workflows/util/; \
./install_spark_resources.sh 3.2; \
./install_spark_resources.sh 3.3; \
diff --git a/dev/docker/Dockerfile.centos8-static-build
b/dev/docker/Dockerfile.centos8-static-build
index 9e11692273..2f80f51b41 100644
--- a/dev/docker/Dockerfile.centos8-static-build
+++ b/dev/docker/Dockerfile.centos8-static-build
@@ -34,7 +34,7 @@ RUN set -ex; \
yum install -y java-1.8.0-openjdk-devel patch wget git perl; \
rpm -qa | grep tzdata; \
dnf clean all; \
- git clone --depth=1 https://github.com/apache/incubator-gluten
/opt/gluten; \
+ git clone -b branch-1.5 --depth=1
https://github.com/apache/incubator-gluten /opt/gluten; \
cd /opt/gluten && bash ./dev/vcpkg/setup-build-depends.sh; \
mkdir -p ${VCPKG_PATH}; \
echo "Build arrow, then install the native libs to system paths and jar
package to .m2/ directory."; \
diff --git a/dev/docker/Dockerfile.centos9-dynamic-build
b/dev/docker/Dockerfile.centos9-dynamic-build
index e50268cbc0..9996fc9a61 100644
--- a/dev/docker/Dockerfile.centos9-dynamic-build
+++ b/dev/docker/Dockerfile.centos9-dynamic-build
@@ -43,7 +43,7 @@ RUN set -ex; \
wget -nv
https://archive.apache.org/dist/celeborn/celeborn-0.6.0/apache-celeborn-0.6.0-bin.tgz
-P /opt/; \
wget -nv
https://archive.apache.org/dist/incubator/uniffle/0.9.2/apache-uniffle-0.9.2-incubating-bin.tar.gz
-P /opt/; \
wget -nv
https://archive.apache.org/dist/hadoop/common/hadoop-2.8.5/hadoop-2.8.5.tar.gz
-P /opt/; \
- git clone --depth=1 https://github.com/apache/incubator-gluten
/opt/gluten; \
+ git clone -b branch-1.5 --depth=1
https://github.com/apache/incubator-gluten /opt/gluten; \
cd /opt/gluten/.github/workflows/util/; \
./install_spark_resources.sh 3.2; \
./install_spark_resources.sh 3.3; \
diff --git a/dev/docker/Dockerfile.centos9-static-build
b/dev/docker/Dockerfile.centos9-static-build
index d50837c8ac..bdfea34355 100644
--- a/dev/docker/Dockerfile.centos9-static-build
+++ b/dev/docker/Dockerfile.centos9-static-build
@@ -31,7 +31,7 @@ RUN set -ex; \
echo "check_certificate = off" >> ~/.wgetrc; \
yum install -y java-17-openjdk-devel patch wget git perl; \
dnf clean all; \
- git clone --depth=1 https://github.com/apache/incubator-gluten
/opt/gluten; \
+ git clone -b branch-1.5 --depth=1
https://github.com/apache/incubator-gluten /opt/gluten; \
cd /opt/gluten && bash ./dev/vcpkg/setup-build-depends.sh; \
mkdir -p ${VCPKG_PATH}; \
echo "Build arrow, then install the native libs to system paths and jar
package to .m2/ directory."; \
diff --git a/dev/docker/cudf/Dockerfile b/dev/docker/cudf/Dockerfile
index 668cc3cc0a..aaf3132985 100644
--- a/dev/docker/cudf/Dockerfile
+++ b/dev/docker/cudf/Dockerfile
@@ -18,7 +18,7 @@
FROM ghcr.io/facebookincubator/velox-dev:adapters
RUN yum install -y sudo patch maven perl && ln -sf /usr/local/bin/cmake
/usr/bin
-RUN git clone --depth=1 https://github.com/apache/incubator-gluten /opt/gluten
+RUN git clone -b branch-1.5 --depth=1
https://github.com/apache/incubator-gluten /opt/gluten
# Install spark to folder /opt
RUN cd /opt/gluten/.github/workflows/util/ && ./install_spark_resources.sh 3.4
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
