This is an automated email from the ASF dual-hosted git repository.

kou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/main by this push:
     new ac990563b4 GH-47052: [CI][C++] Use Alpine Linux 3.22 instead of 3.18 
(#47148)
ac990563b4 is described below

commit ac990563b44eab7bde47e1f8187d4929e79e9df9
Author: Raúl Cumplido <[email protected]>
AuthorDate: Tue Aug 12 18:24:30 2025 -0300

    GH-47052: [CI][C++] Use Alpine Linux 3.22 instead of 3.18 (#47148)
    
    ### Rationale for this change
    
    Alpine Linux 3.18 is currently deprecated.
    
    ### What changes are included in this PR?
    
    Update version of Alpine Linux.
    
    ### Are these changes tested?
    
    Via CI
    
    * GitHub Issue: #47052
    
    Lead-authored-by: Raúl Cumplido <[email protected]>
    Co-authored-by: Sutou Kouhei <[email protected]>
    Signed-off-by: Sutou Kouhei <[email protected]>
---
 .env                                                               | 2 +-
 ...-linux-3.18-cpp.dockerfile => alpine-linux-3.22-cpp.dockerfile} | 7 ++++---
 cpp/src/arrow/dataset/CMakeLists.txt                               | 3 +--
 docker-compose.yml                                                 | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.env b/.env
index 81638c67ef..274752d6a1 100644
--- a/.env
+++ b/.env
@@ -47,7 +47,7 @@ ULIMIT_CORE=-1
 
 # Default versions for platforms
 ALMALINUX=8
-ALPINE_LINUX=3.18
+ALPINE_LINUX=3.22
 DEBIAN=12
 FEDORA=42
 UBUNTU=22.04
diff --git a/ci/docker/alpine-linux-3.18-cpp.dockerfile 
b/ci/docker/alpine-linux-3.22-cpp.dockerfile
similarity index 96%
rename from ci/docker/alpine-linux-3.18-cpp.dockerfile
rename to ci/docker/alpine-linux-3.22-cpp.dockerfile
index 60815b7e55..f03e1913e2 100644
--- a/ci/docker/alpine-linux-3.18-cpp.dockerfile
+++ b/ci/docker/alpine-linux-3.22-cpp.dockerfile
@@ -16,7 +16,7 @@
 # under the License.
 
 ARG arch=amd64
-FROM ${arch}/alpine:3.18
+FROM ${arch}/alpine:3.22
 
 RUN apk add \
         apache-orc-dev \
@@ -40,8 +40,9 @@ RUN apk add \
         grpc-dev \
         gtest-dev \
         libxml2-dev \
-        llvm16-dev \
-        llvm16-static \
+        llvm-dev \
+        llvm-gtest \
+        llvm-static \
         lz4-dev \
         make \
         musl-locales \
diff --git a/cpp/src/arrow/dataset/CMakeLists.txt 
b/cpp/src/arrow/dataset/CMakeLists.txt
index d87afdf5bd..fa6875527d 100644
--- a/cpp/src/arrow/dataset/CMakeLists.txt
+++ b/cpp/src/arrow/dataset/CMakeLists.txt
@@ -191,8 +191,7 @@ if(ARROW_JSON)
 endif()
 
 if(ARROW_ORC)
-  add_arrow_dataset_test(file_orc_test EXTRA_LINK_LIBS 
${ARROW_DATASET_TEST_LINK_LIBS}
-                         orc::orc)
+  add_arrow_dataset_test(file_orc_test EXTRA_LINK_LIBS 
${ARROW_DATASET_TEST_LINK_LIBS})
 endif()
 
 if(ARROW_PARQUET)
diff --git a/docker-compose.yml b/docker-compose.yml
index cddd075ddd..3c2ea37de3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -219,7 +219,7 @@ services:
     #   docker compose build alpine-linux-cpp
     #   docker compose run --rm alpine-linux-cpp
     # Parameters:
-    #   ALPINE_LINUX: 3.18
+    #   ALPINE_LINUX: 3.22
     #   ARCH: amd64, arm64v8, ...
     image: ${REPO}:${ARCH}-alpine-linux-${ALPINE_LINUX}-cpp
     build:

Reply via email to