diff --git a/docker/README.md b/docker/README.md index e645b12d8b..e77c2ebf29 100644 --- a/docker/README.md +++ b/docker/README.md @@ -1,6 +1,6 @@ ## Supported OSes -* CentOS 7 and 8 +* CentOS 7 * Debian 9 and 10 * Ubuntu 18 and 20 diff --git a/docker/centos8/Dockerfile b/docker/centos8/Dockerfile deleted file mode 100644 index 74809c34d5..0000000000 --- a/docker/centos8/Dockerfile +++ /dev/null @@ -1,69 +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 CentOS 8 -# - -FROM centos:8 -LABEL maintainer="Apache ORC project " -ARG jdk=8 - -RUN yum check-update || true -RUN yum install -y \ - cmake \ - curl-devel \ - cyrus-sasl-devel \ - expat-devel \ - gcc \ - gcc-c++ \ - gettext-devel \ - git \ - libarchive \ - libtool \ - make \ - maven \ - openssl-devel \ - tar \ - wget \ - which \ - zlib-devel && \ - if [ "${jdk}" = "11" ] ; then \ - yum install -y \ - java-11-openjdk \ - java-11-openjdk-devel \ - && \ - update-alternatives --set java $(readlink -f /usr/lib/jvm/java-11-openjdk/bin/java) && \ - update-alternatives --set javac $(readlink -f /usr/lib/jvm/java-11-openjdk/bin/javac) \ - ; else \ - yum install -y \ - java-1.8.0-openjdk \ - java-1.8.0-openjdk-devel \ - ; fi - -ENV TZ=America/Los_Angeles -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 ef4b687cec..2dc99430d4 100644 --- a/docker/os-list.txt +++ b/docker/os-list.txt @@ -1,5 +1,4 @@ centos7 -centos8 debian9 debian10 debian11 diff --git a/site/_docs/building.md b/site/_docs/building.md index a947ddd288..76a3a18a4c 100644 --- a/site/_docs/building.md +++ b/site/_docs/building.md @@ -9,7 +9,7 @@ dockerUrl: https://github.com/apache/orc/blob/main/docker The C++ library is supported on the following operating systems: -* CentOS 7 or 8 +* CentOS 7 * Debian 9 to 11 * MacOS 11 to 12.1 * Ubuntu 18.04 or 20.04 @@ -26,7 +26,6 @@ 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: * [CentOS 7]({{ page.dockerUrl }}/centos7/Dockerfile) -* [CentOS 8]({{ page.dockerUrl }}/centos8/Dockerfile) * [Debian 9]({{ page.dockerUrl }}/debian9/Dockerfile) * [Debian 10]({{ page.dockerUrl }}/debian10/Dockerfile) * [Debian 11]({{ page.dockerUrl }}/debian11/Dockerfile)