Skip to content

Commit 62aad8b

Browse files
authored
[1.5] Fix code branch used for building docker images (#11046)
1 parent 68d884f commit 62aad8b

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

dev/docker/Dockerfile.centos7-static-build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ RUN set -ex; \
3535
-e 's/mirror\.centos\.org/vault.centos.org/' \
3636
/etc/yum.repos.d/CentOS-SCLo-scl-rh.repo; \
3737
yum install -y git patch wget sudo java-1.8.0-openjdk-devel ccache; \
38-
git clone --depth=1 https://github.com/apache/incubator-gluten /opt/gluten; \
38+
git clone -b branch-1.5 --depth=1 https://github.com/apache/incubator-gluten /opt/gluten; \
3939
echo "check_certificate = off" >> ~/.wgetrc; \
4040
cd /opt/gluten && bash ./dev/vcpkg/setup-build-depends.sh; \
4141
mkdir -p ${VCPKG_PATH}; \

dev/docker/Dockerfile.centos8-dynamic-build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ RUN set -ex; \
4545
wget -nv https://archive.apache.org/dist/celeborn/celeborn-0.6.0/apache-celeborn-0.6.0-bin.tgz -P /opt/; \
4646
wget -nv https://archive.apache.org/dist/incubator/uniffle/0.9.2/apache-uniffle-0.9.2-incubating-bin.tar.gz -P /opt/; \
4747
wget -nv https://archive.apache.org/dist/hadoop/common/hadoop-2.8.5/hadoop-2.8.5.tar.gz -P /opt/; \
48-
git clone --depth=1 https://github.com/apache/incubator-gluten /opt/gluten; \
48+
git clone -b branch-1.5 --depth=1 https://github.com/apache/incubator-gluten /opt/gluten; \
4949
cd /opt/gluten/.github/workflows/util/; \
5050
./install_spark_resources.sh 3.2; \
5151
./install_spark_resources.sh 3.3; \

dev/docker/Dockerfile.centos8-static-build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ RUN set -ex; \
3434
yum install -y java-1.8.0-openjdk-devel patch wget git perl; \
3535
rpm -qa | grep tzdata; \
3636
dnf clean all; \
37-
git clone --depth=1 https://github.com/apache/incubator-gluten /opt/gluten; \
37+
git clone -b branch-1.5 --depth=1 https://github.com/apache/incubator-gluten /opt/gluten; \
3838
cd /opt/gluten && bash ./dev/vcpkg/setup-build-depends.sh; \
3939
mkdir -p ${VCPKG_PATH}; \
4040
echo "Build arrow, then install the native libs to system paths and jar package to .m2/ directory."; \

dev/docker/Dockerfile.centos9-dynamic-build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ RUN set -ex; \
4343
wget -nv https://archive.apache.org/dist/celeborn/celeborn-0.6.0/apache-celeborn-0.6.0-bin.tgz -P /opt/; \
4444
wget -nv https://archive.apache.org/dist/incubator/uniffle/0.9.2/apache-uniffle-0.9.2-incubating-bin.tar.gz -P /opt/; \
4545
wget -nv https://archive.apache.org/dist/hadoop/common/hadoop-2.8.5/hadoop-2.8.5.tar.gz -P /opt/; \
46-
git clone --depth=1 https://github.com/apache/incubator-gluten /opt/gluten; \
46+
git clone -b branch-1.5 --depth=1 https://github.com/apache/incubator-gluten /opt/gluten; \
4747
cd /opt/gluten/.github/workflows/util/; \
4848
./install_spark_resources.sh 3.2; \
4949
./install_spark_resources.sh 3.3; \

dev/docker/Dockerfile.centos9-static-build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ RUN set -ex; \
3131
echo "check_certificate = off" >> ~/.wgetrc; \
3232
yum install -y java-17-openjdk-devel patch wget git perl; \
3333
dnf clean all; \
34-
git clone --depth=1 https://github.com/apache/incubator-gluten /opt/gluten; \
34+
git clone -b branch-1.5 --depth=1 https://github.com/apache/incubator-gluten /opt/gluten; \
3535
cd /opt/gluten && bash ./dev/vcpkg/setup-build-depends.sh; \
3636
mkdir -p ${VCPKG_PATH}; \
3737
echo "Build arrow, then install the native libs to system paths and jar package to .m2/ directory."; \

dev/docker/cudf/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
FROM ghcr.io/facebookincubator/velox-dev:adapters
1919
RUN yum install -y sudo patch maven perl && ln -sf /usr/local/bin/cmake /usr/bin
2020

21-
RUN git clone --depth=1 https://github.com/apache/incubator-gluten /opt/gluten
21+
RUN git clone -b branch-1.5 --depth=1 https://github.com/apache/incubator-gluten /opt/gluten
2222

2323
# Install spark to folder /opt
2424
RUN cd /opt/gluten/.github/workflows/util/ && ./install_spark_resources.sh 3.4

0 commit comments

Comments
 (0)