From 03bf3560d0cc41a50cc3c9299f233e56924bf851 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Wed, 17 Dec 2025 18:33:09 +0100 Subject: [PATCH] GH-48572: [CI] Remove centos-7-cpp dockerfile and reference from compose --- ci/docker/centos-7-cpp.dockerfile | 60 ------------------------------- compose.yaml | 21 ----------- 2 files changed, 81 deletions(-) delete mode 100644 ci/docker/centos-7-cpp.dockerfile diff --git a/ci/docker/centos-7-cpp.dockerfile b/ci/docker/centos-7-cpp.dockerfile deleted file mode 100644 index b012a5abed2..00000000000 --- a/ci/docker/centos-7-cpp.dockerfile +++ /dev/null @@ -1,60 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -FROM centos:centos7 - -# Update mirrors to use vault.centos.org as CentOS 7 -# is EOL since 2024-06-30 -RUN sed -i \ - -e 's/^mirrorlist/#mirrorlist/' \ - -e 's/^#baseurl/baseurl/' \ - -e 's/mirror\.centos\.org/vault.centos.org/' \ - /etc/yum.repos.d/*.repo - -# devtoolset is required for C++17 -RUN \ - yum install -y \ - centos-release-scl \ - epel-release && \ - sed -i \ - -e 's/^mirrorlist/#mirrorlist/' \ - -e 's/^#baseurl/baseurl/' \ - -e 's/^# baseurl/baseurl/' \ - -e 's/mirror\.centos\.org/vault.centos.org/' \ - /etc/yum.repos.d/CentOS-SCLo-scl*.repo && \ - yum install -y \ - curl \ - devtoolset-8 \ - diffutils \ - gcc-c++ \ - libcurl-devel \ - make \ - openssl-devel \ - openssl11-devel \ - wget \ - which - -ARG cmake -COPY ci/scripts/install_cmake.sh /arrow/ci/scripts/ -RUN /arrow/ci/scripts/install_cmake.sh ${cmake} /usr/local/ - -COPY ci/scripts/install_sccache.sh /arrow/ci/scripts/ -RUN bash /arrow/ci/scripts/install_sccache.sh unknown-linux-musl /usr/local/bin - -ENV \ - ARROW_R_DEV=TRUE \ - CMAKE=/usr/local/bin/cmake diff --git a/compose.yaml b/compose.yaml index b89d3082c79..fcdcbe289c1 100644 --- a/compose.yaml +++ b/compose.yaml @@ -115,7 +115,6 @@ x-hierarchy: - almalinux-verify-rc - alpine-linux-cpp - alpine-linux-r - - centos-cpp-static - conda: - conda-cpp: - conda-integration @@ -448,26 +447,6 @@ services: cd /arrow && r/inst/build_arrow_static.sh" - centos-cpp-static: - image: ${REPO}:centos-7-cpp-static - build: - context: . - dockerfile: ci/docker/centos-7-cpp.dockerfile - cache_from: - - ${REPO}:centos-7-cpp-static - args: - cmake: ${CMAKE} - shm_size: *shm-size - volumes: - - .:/arrow:delegated - environment: - <<: [*common, *ccache, *sccache, *cpp] - ARROW_DEPENDENCY_SOURCE: BUNDLED - ARROW_HOME: /arrow - LIBARROW_MINIMAL: "false" - command: /bin/bash -c " - scl enable devtoolset-8 '/arrow/r/inst/build_arrow_static.sh'" - ubuntu-cpp-bundled: # Arrow build with BUNDLED dependencies image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-cpp-minimal