From 3be9a43307778884f5f524616ab5fd839b38b083 Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Tue, 7 Oct 2025 23:37:27 -0700 Subject: [PATCH] ORC-2015: Remove `Debian 11` Support --- .github/workflows/build_and_test.yml | 3 +- docker/README.md | 2 +- docker/debian11/Dockerfile | 52 ---------------------------- docker/os-list.txt | 1 - site/_docs/building.md | 3 +- 5 files changed, 3 insertions(+), 58 deletions(-) delete mode 100644 docker/debian11/Dockerfile diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 5484e7cff3..54db8e5eb8 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -45,7 +45,6 @@ jobs: fail-fast: false matrix: os: - - debian11 - debian12 - debian13 - ubuntu24 @@ -308,4 +307,4 @@ jobs: run: | meson setup build -Dbuildtype=release meson compile -C build - meson test -C build \ No newline at end of file + meson test -C build diff --git a/docker/README.md b/docker/README.md index f475022d0a..a69497cf69 100644 --- a/docker/README.md +++ b/docker/README.md @@ -2,7 +2,7 @@ ## Supported OSes -* Debian 11, 12, and 13 +* Debian 12, and 13 * Fedora 37 * Ubuntu 22 and 24 * Oracle Linux 9 diff --git a/docker/debian11/Dockerfile b/docker/debian11/Dockerfile deleted file mode 100644 index 7af433de18..0000000000 --- a/docker/debian11/Dockerfile +++ /dev/null @@ -1,52 +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. - -# ORC compile for Debian 11 -# - -FROM debian:bullseye -LABEL org.opencontainers.image.authors="Apache ORC project " -LABEL org.opencontainers.image.licenses="Apache-2.0" -LABEL org.opencontainers.image.ref.name="Apache ORC on Debian 11" -LABEL org.opencontainers.image.version="" -ARG jdk=17 - -RUN apt-get update -RUN apt-get install -y \ - cmake \ - gcc \ - g++ \ - git \ - libsasl2-dev \ - libssl-dev \ - make \ - curl \ - maven \ - openjdk-${jdk}-jdk; - -WORKDIR /root - -VOLUME /root/.m2/repository - -CMD if [ ! -d orc ]; then \ - echo "No volume provided, building from apache main."; \ - echo "Pass '-v`pwd`:/root/orc' to docker run to build local source."; \ - git clone https://github.com/apache/orc.git -b main; \ - fi && \ - mkdir build && \ - cd build && \ - cmake ../orc && \ - make package test-out diff --git a/docker/os-list.txt b/docker/os-list.txt index 65ff27719e..1980fff26a 100644 --- a/docker/os-list.txt +++ b/docker/os-list.txt @@ -1,4 +1,3 @@ -debian11 debian12 debian13 ubuntu22 diff --git a/site/_docs/building.md b/site/_docs/building.md index 967cde2e69..8ddc59783a 100644 --- a/site/_docs/building.md +++ b/site/_docs/building.md @@ -10,7 +10,7 @@ dockerUrl: https://github.com/apache/orc/blob/main/docker The C++ library is supported on the following operating systems: * MacOS 14 to 26 -* Debian 11 to 13 +* Debian 12 to 13 * Ubuntu 22.04 to 24.04 * Oracle Linux 8 to 9 * Amazon Linux 2023 @@ -26,7 +26,6 @@ You'll want to install the usual set of developer tools, but at least: For each version of Linux, please check the corresponding Dockerfile, which is in the docker subdirectory, for the list of packages required to build ORC: -* [Debian 11]({{ page.dockerUrl }}/debian11/Dockerfile) * [Debian 12]({{ page.dockerUrl }}/debian12/Dockerfile) * [Debian 13]({{ page.dockerUrl }}/debian13/Dockerfile) * [Ubuntu 22]({{ page.dockerUrl }}/ubuntu22/Dockerfile)