Fix issue

PHILO-HE · Aug 13, 2024 · 0e11ebc · 0e11ebc
1 parent 1289369
commit 0e11ebc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/docker_image.yml b/.github/workflows/docker_image.yml
@@ -30,4 +30,4 @@ jobs:
           context: .
           file: dev/vcpkg/docker/Dockerfile.gha
           push: true
-          tags: apache/gluten-vcpkg-centos-7:latest
+          tags: apache/gluten:vcpkg-centos-7
diff --git a/dev/ci-velox-buildstatic-centos-7.sh b/dev/ci-velox-buildstatic-centos-7.sh
@@ -2,12 +2,8 @@
 
 set -e
 
-yum install sudo patch java-1.8.0-openjdk-devel -y
-cd $GITHUB_WORKSPACE/ep/build-velox/src
-./get_velox.sh
 source /opt/rh/devtoolset-9/enable
 cd $GITHUB_WORKSPACE/
 source ./dev/vcpkg/env.sh
-sed -i '/^headers/d' ep/build-velox/build/velox_ep/CMakeLists.txt
 export NUM_THREADS=4
 ./dev/builddeps-veloxbe.sh --build_tests=OFF --build_benchmarks=OFF --enable_s3=ON --enable_gcs=ON --enable_hdfs=ON --enable_abfs=ON
diff --git a/dev/vcpkg/docker/Dockerfile.gha b/dev/vcpkg/docker/Dockerfile.gha
@@ -11,7 +11,7 @@ RUN sed -i \
        -e 's/mirror\.centos\.org/vault.centos.org/' \
        /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo
 
-RUN yum install -y git patch wget sudo
+RUN yum install -y git patch wget sudo java-1.8.0-openjdk-devel
 
 # build
 RUN git clone --depth=1 https://github.com/apache/incubator-gluten /opt/gluten
@@ -22,4 +22,6 @@ RUN cd /opt/gluten && bash ./dev/vcpkg/setup-build-depends.sh
 
 # vcpkg env
 ENV VCPKG_BINARY_SOURCES=clear;files,/var/cache/vcpkg,readwrite
-RUN source /opt/rh/devtoolset-9/enable && cd /opt/gluten && source dev/vcpkg/env.sh
+
+RUN cd /opt/gluten && source ./dev/vcpkg/env.sh && \
+    bash ./dev/builddeps-veloxbe.sh --build_arrow=ON