diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 824b89bb12..c0884f51e4 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -79,9 +79,6 @@ jobs: cxx: - clang++ include: - - os: ubuntu-22.04 - java: 17 - cxx: g++ - os: macos-15 java: 17 cxx: clang++ @@ -185,7 +182,7 @@ jobs: max-parallel: 20 matrix: os: - - ubuntu-22.04 + - ubuntu-24.04 cxx: - clang++ env: @@ -298,7 +295,6 @@ jobs: max-parallel: 20 matrix: os: - - ubuntu-22.04 - ubuntu-24.04 - ubuntu-24.04-arm - macos-15 diff --git a/docker/README.md b/docker/README.md index 9c03cad64f..14603be773 100644 --- a/docker/README.md +++ b/docker/README.md @@ -4,7 +4,7 @@ * Debian 12, and 13 * Fedora 37 -* Ubuntu 22, 24 and 26 +* Ubuntu 24 and 26 * Oracle Linux 9 and 10 * Amazon Linux 2023 @@ -12,7 +12,7 @@ Apache ORC community provides a set of pre-built docker images and uses it during testing. - docker pull apache/orc-dev:ubuntu22 + docker pull apache/orc-dev:ubuntu24 You can find all tags here. diff --git a/docker/os-list.txt b/docker/os-list.txt index a80d229730..06ad440c8e 100644 --- a/docker/os-list.txt +++ b/docker/os-list.txt @@ -1,6 +1,5 @@ debian12 debian13 -ubuntu22 ubuntu24 ubuntu26 oraclelinux9 diff --git a/docker/ubuntu22/Dockerfile b/docker/ubuntu22/Dockerfile deleted file mode 100644 index acd7150e73..0000000000 --- a/docker/ubuntu22/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. - -# ORC compile for Ubuntu 22 -# - -FROM ubuntu:22.04 -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 Ubuntu 22" -LABEL org.opencontainers.image.version="" -ARG jdk=17 -ARG cc=gcc - -RUN ln -fs /usr/share/zoneinfo/America/Los_Angeles /etc/localtime -RUN apt-get update -RUN apt-get install -y \ - cmake \ - git \ - libsasl2-dev \ - libssl-dev \ - make \ - curl \ - maven \ - openjdk-${jdk}-jdk \ - tzdata; \ - if [ "${cc}" = "gcc" ] ; then \ - apt-get install -y \ - gcc \ - g++ \ - ; else \ - apt-get install -y \ - clang \ - && \ - update-alternatives --set cc /usr/bin/clang && \ - update-alternatives --set c++ /usr/bin/clang++ \ - ; fi -RUN update-alternatives --set java $(update-alternatives --list java | grep ${jdk}) && \ - update-alternatives --set javac $(update-alternatives --list javac | grep ${jdk}) - -ENV CC=cc -ENV CXX=c++ - -WORKDIR /root -VOLUME /root/.m2/repository - -CMD ["/bin/bash", "-c", "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/site/_docs/building.md b/site/_docs/building.md index 5536fd7191..08e1a3367e 100644 --- a/site/_docs/building.md +++ b/site/_docs/building.md @@ -11,7 +11,7 @@ The C++ library is supported on the following operating systems: * MacOS 15 to 26 * Debian 12 to 13 -* Ubuntu 22.04 to 26.04 +* Ubuntu 24.04 to 26.04 * Oracle Linux 9 to 10 * Amazon Linux 2023 @@ -28,7 +28,6 @@ is in the docker subdirectory, for the list of packages required to build ORC: * [Debian 12]({{ page.dockerUrl }}/debian12/Dockerfile) * [Debian 13]({{ page.dockerUrl }}/debian13/Dockerfile) -* [Ubuntu 22]({{ page.dockerUrl }}/ubuntu22/Dockerfile) * [Ubuntu 24]({{ page.dockerUrl }}/ubuntu24/Dockerfile) * [Ubuntu 26]({{ page.dockerUrl }}/ubuntu26/Dockerfile) * [Oracle Linux 9]({{ page.dockerUrl }}/oraclelinux9/Dockerfile)