Skip to content

Commit 3cd1837

Browse files
committed
ORC-1498: Add Debian 12 Docker test
### What changes were proposed in this pull request? This PR aims to add `Debian 12` Docker test. ### Why are the changes needed? To improve the test coverage for the new Debian OS environment. ### How was this patch tested? Run the docker tests. ``` $ cd docker $ ./run-one.sh local ORC-1498 debian12 Started local run for ORC-1498 on debian12 at Tue Aug 29 23:50:19 PDT 2023 -- The C compiler identification is GNU 12.2.0 -- The CXX compiler identification is GNU 12.2.0 ... Java version: 17.0.8, vendor: Debian, runtime: /usr/lib/jvm/java-17-openjdk-arm64 ... Run CPack packaging tool... CPack: Create package using TGZ CPack: Install projects CPack: - Run preinstall target for: ORC CPack: - Install project: ORC [] CPack: Create package CPack: - package: /root/build/ORC-2.0.0-SNAPSHOT-Linux.tar.gz generated. Test project /root/build Start 1: orc-test 1/8 Test #1: orc-test ......................... Passed 4.61 sec Start 2: java-test 2/8 Test #2: java-test ........................ Passed 105.33 sec Start 3: java-tools-test 3/8 Test #3: java-tools-test .................. Passed 0.08 sec Start 4: java-bench-gen-test 4/8 Test #4: java-bench-gen-test .............. Passed 0.73 sec Start 5: java-bench-scan-test 5/8 Test #5: java-bench-scan-test ............. Passed 0.65 sec Start 6: java-bench-hive-test 6/8 Test #6: java-bench-hive-test ............. Passed 11.11 sec Start 7: java-bench-spark-test 7/8 Test #7: java-bench-spark-test ............ Passed 3.23 sec Start 8: tool-test 8/8 Test #8: tool-test ........................ Passed 6.70 sec 100% tests passed, 0 tests failed out of 8 Total Test time (real) = 132.45 sec Built target test-out Finished debian12 at Wed Aug 30 00:02:14 PDT 2023 ``` Closes #1605 from dongjoon-hyun/ORC-1498. Authored-by: Dongjoon Hyun <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]>
1 parent 0cfbe91 commit 3cd1837

File tree

4 files changed

+53
-2
lines changed

4 files changed

+53
-2
lines changed

docker/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## Supported OSes
22

33
* CentOS 7
4-
* Debian 10 and 11
4+
* Debian 10, 11, and 12
55
* Fedora 37
66
* Ubuntu 20 and 22
77

docker/debian12/Dockerfile

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
17+
# ORC compile for Debian 12
18+
#
19+
20+
FROM debian:bookworm
21+
LABEL maintainer="Apache ORC project <[email protected]>"
22+
ARG jdk=17
23+
24+
RUN apt-get update
25+
RUN apt-get install -y \
26+
cmake \
27+
gcc \
28+
g++ \
29+
git \
30+
libsasl2-dev \
31+
libssl-dev \
32+
make \
33+
curl \
34+
maven \
35+
openjdk-${jdk}-jdk
36+
37+
WORKDIR /root
38+
39+
VOLUME /root/.m2/repository
40+
41+
CMD if [ ! -d orc ]; then \
42+
echo "No volume provided, building from apache main."; \
43+
echo "Pass '-v`pwd`:/root/orc' to docker run to build local source."; \
44+
git clone https://github.com/apache/orc.git -b main; \
45+
fi && \
46+
mkdir build && \
47+
cd build && \
48+
cmake ../orc && \
49+
make package test-out

docker/os-list.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
centos7
22
debian10
33
debian11
4+
debian12
45
ubuntu20
56
ubuntu22
67
fedora37

site/_docs/building.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dockerUrl: https://github.com/apache/orc/blob/main/docker
1010
The C++ library is supported on the following operating systems:
1111

1212
* CentOS 7
13-
* Debian 10 to 11
13+
* Debian 10 to 12
1414
* MacOS 11.6 and 12.5
1515
* Ubuntu 20.04 to 22.04
1616

@@ -28,6 +28,7 @@ is in the docker subdirectory, for the list of packages required to build ORC:
2828
* [CentOS 7]({{ page.dockerUrl }}/centos7/Dockerfile)
2929
* [Debian 10]({{ page.dockerUrl }}/debian10/Dockerfile)
3030
* [Debian 11]({{ page.dockerUrl }}/debian11/Dockerfile)
31+
* [Debian 12]({{ page.dockerUrl }}/debian12/Dockerfile)
3132
* [Ubuntu 20]({{ page.dockerUrl }}/ubuntu20/Dockerfile)
3233
* [Ubuntu 22]({{ page.dockerUrl }}/ubuntu22/Dockerfile)
3334

0 commit comments

Comments
 (0)