From b87b8155ef4a158d78de8497a56b78009eef2e92 Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Sat, 23 Dec 2023 19:34:20 -0800 Subject: [PATCH] ORC-1555: Simplify `fedora37` docker image --- docker/fedora37/Dockerfile | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/docker/fedora37/Dockerfile b/docker/fedora37/Dockerfile index df3a347cd8..bf4a50fc1c 100644 --- a/docker/fedora37/Dockerfile +++ b/docker/fedora37/Dockerfile @@ -19,7 +19,6 @@ FROM fedora:37 LABEL maintainer="Apache ORC project " -ARG jdk=17 RUN yum check-update || true RUN yum install -y \ @@ -33,24 +32,12 @@ RUN yum install -y \ git \ libtool \ make \ - maven \ openssl-devel \ tar \ wget \ which \ - zlib-devel && \ - if [ "${jdk}" = "11" ] ; then \ - yum install -y \ - java-11-openjdk \ - java-11-openjdk-devel \ - && \ - update-alternatives --set java $(readlink -f /usr/lib/jvm/java-11-openjdk/bin/java) && \ - update-alternatives --set javac $(readlink -f /usr/lib/jvm/java-11-openjdk/bin/javac) \ - ; elif [ "${jdk}" = "8" ] ; then \ - yum install -y \ - java-1.8.0-openjdk \ - java-1.8.0-openjdk-devel \ - ; fi + zlib-devel \ + java-17-openjdk-devel ENV TZ=America/Los_Angeles WORKDIR /root