From 86011890be0a1c67402ca3cbf458d8d3719e3e88 Mon Sep 17 00:00:00 2001
From: Dongjoon Hyun <dongjoon@apache.org>
Date: Tue, 29 Aug 2023 23:19:14 -0700
Subject: [PATCH 1/2] ORC-1498: Add Debian 12 Docker test

---
 docker/README.md           |  2 +-
 docker/debian12/Dockerfile | 49 ++++++++++++++++++++++++++++++++++++++
 docker/os-list.txt         |  1 +
 site/_docs/building.md     |  3 ++-
 4 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 docker/debian12/Dockerfile

diff --git a/docker/README.md b/docker/README.md
index 59d6d8b8db..8fcd16c127 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,7 +1,7 @@
 ## Supported OSes
 
 * CentOS 7
-* Debian 10 and 11
+* Debian 10, 11, and 12
 * Fedora 37
 * Ubuntu 20 and 22
 
diff --git a/docker/debian12/Dockerfile b/docker/debian12/Dockerfile
new file mode 100644
index 0000000000..e3a31b745a
--- /dev/null
+++ b/docker/debian12/Dockerfile
@@ -0,0 +1,49 @@
+# 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 Debian 12
+#
+
+FROM debian:bookworm
+LABEL maintainer="Apache ORC project <dev@orc.apache.org>"
+ARG jdk=17
+
+RUN apt-get update
+RUN apt-get install -y \
+  cmake \
+  gcc \
+  g++ \
+  git \
+  libsasl2-dev \
+  libssl-dev \
+  make \
+  curl \
+  maven \
+  openjdk-${jdk}-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/docker/os-list.txt b/docker/os-list.txt
index 79a499e396..10c4507687 100644
--- a/docker/os-list.txt
+++ b/docker/os-list.txt
@@ -1,6 +1,7 @@
 centos7
 debian10
 debian11
+debian12
 ubuntu20
 ubuntu22
 fedora37
diff --git a/site/_docs/building.md b/site/_docs/building.md
index 5c393c387e..4295d1fe37 100644
--- a/site/_docs/building.md
+++ b/site/_docs/building.md
@@ -10,7 +10,7 @@ dockerUrl: https://github.com/apache/orc/blob/main/docker
 The C++ library is supported on the following operating systems:
 
 * CentOS 7
-* Debian 10 to 11
+* Debian 10 to 12
 * MacOS 11.6 and 12.5
 * Ubuntu 20.04 to 22.04
 
@@ -28,6 +28,7 @@ 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)
+* [Debian 12]({{ page.dockerUrl }}/debian12/Dockerfile)
 * [Ubuntu 20]({{ page.dockerUrl }}/ubuntu20/Dockerfile)
 * [Ubuntu 22]({{ page.dockerUrl }}/ubuntu22/Dockerfile)
 

From f0657e9536e784095b846ed26a3f29bbe1090d13 Mon Sep 17 00:00:00 2001
From: Dongjoon Hyun <dongjoon@apache.org>
Date: Tue, 29 Aug 2023 23:37:54 -0700
Subject: [PATCH 2/2] Fix

---
 docker/debian12/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/debian12/Dockerfile b/docker/debian12/Dockerfile
index e3a31b745a..f0c2a600eb 100644
--- a/docker/debian12/Dockerfile
+++ b/docker/debian12/Dockerfile
@@ -32,7 +32,7 @@ RUN apt-get install -y \
   make \
   curl \
   maven \
-  openjdk-${jdk}-jdk; \
+  openjdk-${jdk}-jdk
 
 WORKDIR /root