Skip to content

Commit ac99056

Browse files
raulcdkou
andauthored
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]>
1 parent 2dd3ccd commit ac99056

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ ULIMIT_CORE=-1
4747

4848
# Default versions for platforms
4949
ALMALINUX=8
50-
ALPINE_LINUX=3.18
50+
ALPINE_LINUX=3.22
5151
DEBIAN=12
5252
FEDORA=42
5353
UBUNTU=22.04

ci/docker/alpine-linux-3.18-cpp.dockerfile renamed to ci/docker/alpine-linux-3.22-cpp.dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# under the License.
1717

1818
ARG arch=amd64
19-
FROM ${arch}/alpine:3.18
19+
FROM ${arch}/alpine:3.22
2020

2121
RUN apk add \
2222
apache-orc-dev \
@@ -40,8 +40,9 @@ RUN apk add \
4040
grpc-dev \
4141
gtest-dev \
4242
libxml2-dev \
43-
llvm16-dev \
44-
llvm16-static \
43+
llvm-dev \
44+
llvm-gtest \
45+
llvm-static \
4546
lz4-dev \
4647
make \
4748
musl-locales \

cpp/src/arrow/dataset/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,7 @@ if(ARROW_JSON)
191191
endif()
192192

193193
if(ARROW_ORC)
194-
add_arrow_dataset_test(file_orc_test EXTRA_LINK_LIBS ${ARROW_DATASET_TEST_LINK_LIBS}
195-
orc::orc)
194+
add_arrow_dataset_test(file_orc_test EXTRA_LINK_LIBS ${ARROW_DATASET_TEST_LINK_LIBS})
196195
endif()
197196

198197
if(ARROW_PARQUET)

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ services:
219219
# docker compose build alpine-linux-cpp
220220
# docker compose run --rm alpine-linux-cpp
221221
# Parameters:
222-
# ALPINE_LINUX: 3.18
222+
# ALPINE_LINUX: 3.22
223223
# ARCH: amd64, arm64v8, ...
224224
image: ${REPO}:${ARCH}-alpine-linux-${ALPINE_LINUX}-cpp
225225
build:

0 commit comments

Comments
 (0)