This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-1.9
in repository https://gitbox.apache.org/repos/asf/orc.git
The following commit(s) were added to refs/heads/branch-1.9 by this push:
new 542353d38 ORC-1621: Switch to `oraclelinux9` from `rocky9`
542353d38 is described below
commit 542353d38daec11cdd632e5b999884ea0a7e3539
Author: Dongjoon Hyun <[email protected]>
AuthorDate: Fri Feb 16 15:58:24 2024 -0800
ORC-1621: Switch to `oraclelinux9` from `rocky9`
### What changes were proposed in this pull request?
This PR aims to switch to `oraclelinux9` from `rocky9`.
### Why are the changes needed?
Now, the official OracleLinux 9 image is available.
- https://hub.docker.com/_/oraclelinux
### How was this patch tested?
Pass the CIs. The GitHub Action CI has the replaced `oraclelinux9` job.
### Was this patch authored or co-authored using generative AI tooling?
No.
Closes #1802 from dongjoon-hyun/oraclelinux9.
Authored-by: Dongjoon Hyun <[email protected]>
Signed-off-by: Dongjoon Hyun <[email protected]>
(cherry picked from commit 31fa612f965f04844a019d7fac408cdd8e275840)
Signed-off-by: Dongjoon Hyun <[email protected]>
---
.github/workflows/build_and_test.yml | 2 +-
docker/{rocky9 => oraclelinux9}/Dockerfile | 4 ++--
docker/os-list.txt | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/build_and_test.yml
b/.github/workflows/build_and_test.yml
index 37d399c3f..879addaec 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -30,7 +30,7 @@ jobs:
- debian11
- debian12
- fedora37
- - rocky9
+ - oraclelinux9
steps:
- name: Checkout
uses: actions/checkout@v2
diff --git a/docker/rocky9/Dockerfile b/docker/oraclelinux9/Dockerfile
similarity index 96%
rename from docker/rocky9/Dockerfile
rename to docker/oraclelinux9/Dockerfile
index fe4c19723..094ec828f 100644
--- a/docker/rocky9/Dockerfile
+++ b/docker/oraclelinux9/Dockerfile
@@ -14,10 +14,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# ORC compile for Rocky Linux 9
+# ORC compile for Oracle Linux 9
#
-FROM rockylinux:9
+FROM oraclelinux:9
LABEL maintainer="Apache ORC project <[email protected]>"
RUN yum check-update || true
diff --git a/docker/os-list.txt b/docker/os-list.txt
index 4635eaa66..b8240ec64 100644
--- a/docker/os-list.txt
+++ b/docker/os-list.txt
@@ -5,4 +5,4 @@ debian12
ubuntu20
ubuntu22
fedora37
-rocky9
+oraclelinux9
