[orc] branch branch-1.6 updated: ORC-1113: Remove CentOS 8 from docker-based tests (#1040)

[do...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dongjoon pushed a commit to branch branch-1.6
in repository https://gitbox.apache.org/repos/asf/orc.git


The following commit(s) were added to refs/heads/branch-1.6 by this push:
     new 09b3d8411 ORC-1113: Remove CentOS 8 from docker-based tests (#1040)
09b3d8411 is described below

commit 09b3d84115b1760835b86ac74ffe2644a4f14954
Author: Dongjoon Hyun <do...@apache.org>
AuthorDate: Tue Feb 1 22:33:27 2022 -0800

    ORC-1113: Remove CentOS 8 from docker-based tests (#1040)
    
    This PR aims to remove CentOS 8 from docker-based tests.
    
    CentOS 8 became EOL and Docker image build is failing now.
    - https://www.centos.org/centos-linux-eol/
    
    ```
    ```
    
    Manually.
    
    (cherry picked from commit e62a16bb41fb98f2bf2c11e18a45e81f47b4f2a6)
    Signed-off-by: Dongjoon Hyun <do...@apache.org>
---
 docker/README.md          |  6 +++++
 docker/centos8/Dockerfile | 57 -----------------------------------------------
 docker/os-list.txt        |  1 -
 site/_docs/building.md    |  3 +--
 4 files changed, 7 insertions(+), 60 deletions(-)

diff --git a/docker/README.md b/docker/README.md
index 3ba46fdfb..19f79632f 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,8 +1,14 @@
 ## Supported OSes
 
+<<<<<<< HEAD
 * CentOS 7, and 8
 * Debian 9, and 10
 * Ubuntu 16, 18, and 20
+=======
+* CentOS 7
+* Debian 9 and 10
+* Ubuntu 18 and 20
+>>>>>>> 3c77a880 (ORC-1113: Remove CentOS 8 from docker-based tests (#1040))
 
 ## Test
 
diff --git a/docker/centos8/Dockerfile b/docker/centos8/Dockerfile
deleted file mode 100644
index 3736b316e..000000000
--- a/docker/centos8/Dockerfile
+++ /dev/null
@@ -1,57 +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 <de...@orc.apache.org>"
-
-RUN yum check-update || true
-RUN yum install -y \
-  cmake \
-  curl-devel \
-  cyrus-sasl-devel \
-  expat-devel \
-  gcc \
-  gcc-c++ \
-  gettext-devel \
-  git \
-  java-1.8.0-openjdk \
-  java-1.8.0-openjdk-devel \
-  libtool \
-  make \
-  maven \
-  openssl-devel \
-  tar \
-  wget \
-  which \
-  zlib-devel
-
-ENV TZ=America/Los_Angeles
-WORKDIR /root
-
-VOLUME /root/.m2/repository
-
-CMD if [ ! -d orc ]; then \
-      echo "No volume provided, building from apache master."; \
-      echo "Pass '-v`pwd`:/root/orc' to docker run to build local source."; \
-      git clone https://github.com/apache/orc.git -b master; \
-    fi && \
-    mkdir build && \
-    cd build && \
-    cmake ../orc && \
-    make package test-out
diff --git a/docker/os-list.txt b/docker/os-list.txt
index cf60ff7fa..ac9491875 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 f8d6eb6cb..7e386d437 100644
--- a/site/_docs/building.md
+++ b/site/_docs/building.md
@@ -9,7 +9,7 @@ dockerUrl: https://github.com/apache/orc/blob/master/docker
 
 The C++ library is supported on the following operating systems:
 
-* CentOS 6 or 7
+* CentOS 7
 * Debian 8 or 9
 * MacOS 10.10 to 10.13
 * Ubuntu 14.04, 16.04, or 18.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 8]({{ page.dockerUrl }}/debian8/Dockerfile)
 * [Debian 9]({{ page.dockerUrl }}/debian9/Dockerfile)
 * [Ubuntu 16]({{ page.dockerUrl }}/ubuntu16/Dockerfile)