This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-1.8
in repository https://gitbox.apache.org/repos/asf/orc.git
The following commit(s) were added to refs/heads/branch-1.8 by this push:
new dcdfff336 ORC-1411: Remove Ubuntu 18.04 LTS from Docker Tests
dcdfff336 is described below
commit dcdfff3367ad74e59d46d94f56a8590d1197a8e7
Author: Deshan Xiao <[email protected]>
AuthorDate: Wed Apr 19 19:55:17 2023 +0800
ORC-1411: Remove Ubuntu 18.04 LTS from Docker Tests
This PR is aimed to remove `Ubuntu 18.04 LTS` from Docker Tests.
Ubuntu 18.04 LTS supports reach EOL on April 30, 2023.
https://ubuntu.com/about/release-cycle
N/A.
This closes #1471
---
.github/workflows/build_and_test.yml | 2 +-
docker/README.md | 2 +-
docker/os-list.txt | 1 -
docker/ubuntu18/Dockerfile | 52 ------------------------------------
site/_docs/building.md | 3 +--
5 files changed, 3 insertions(+), 57 deletions(-)
diff --git a/.github/workflows/build_and_test.yml
b/.github/workflows/build_and_test.yml
index e3b4d3db2..9dbf23d73 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -23,7 +23,7 @@ jobs:
- centos7
- debian10
- debian11
- - ubuntu18
+ - ubuntu20
- fedora37
- oraclelinux9
steps:
diff --git a/docker/README.md b/docker/README.md
index 2f9bd54a2..59792cb2b 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -3,7 +3,7 @@
* CentOS 7
* Debian 10 and 11
* Fedora 37
-* Ubuntu 18, 20 and 22
+* Ubuntu 20 and 22
* Rocky 9
## Pre-built Images
diff --git a/docker/os-list.txt b/docker/os-list.txt
index 4f313ab96..e2f544e1d 100644
--- a/docker/os-list.txt
+++ b/docker/os-list.txt
@@ -1,7 +1,6 @@
centos7
debian10
debian11
-ubuntu18
ubuntu20
ubuntu22
fedora37
diff --git a/docker/ubuntu18/Dockerfile b/docker/ubuntu18/Dockerfile
deleted file mode 100644
index 3e6a65ca6..000000000
--- a/docker/ubuntu18/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 Ubuntu 18
-#
-
-FROM ubuntu:18.04
-LABEL maintainer="Apache ORC project <[email protected]>"
-ARG jdk=8
-
-RUN ln -fs /usr/share/zoneinfo/America/Los_Angeles /etc/localtime
-RUN apt-get update
-RUN apt-get install -y \
- cmake \
- gcc \
- g++ \
- git \
- libsasl2-dev \
- libssl-dev \
- make \
- curl \
- maven \
- openjdk-${jdk}-jdk \
- tzdata
-RUN update-alternatives --set java $(update-alternatives --list java | grep
${jdk}) && \
- update-alternatives --set javac $(update-alternatives --list javac | grep
${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/site/_docs/building.md b/site/_docs/building.md
index e169f692b..6480faded 100644
--- a/site/_docs/building.md
+++ b/site/_docs/building.md
@@ -12,7 +12,7 @@ The C++ library is supported on the following operating
systems:
* CentOS 7
* Debian 10 to 11
* MacOS 13 to 14
-* Ubuntu 18.04 to 22.04
+* Ubuntu 20.04 to 22.04
You'll want to install the usual set of developer tools, but at least:
@@ -28,7 +28,6 @@ is in the docker subdirectory, for the list of packages
required to build ORC:
* [CentOS 7]({{ page.dockerUrl }}/centos7/Dockerfile)
* [Debian 10]({{ page.dockerUrl }}/debian10/Dockerfile)
* [Debian 11]({{ page.dockerUrl }}/debian11/Dockerfile)
-* [Ubuntu 18]({{ page.dockerUrl }}/ubuntu18/Dockerfile)
* [Ubuntu 20]({{ page.dockerUrl }}/ubuntu20/Dockerfile)
* [Ubuntu 22]({{ page.dockerUrl }}/ubuntu22/Dockerfile)
