From a451da9981abd335abe0c6c7f3929a3d5b47c406 Mon Sep 17 00:00:00 2001 From: Yuya Ebihara Date: Fri, 24 May 2024 06:43:01 +0900 Subject: [PATCH 1/2] Install supervisor with yum --- testing/centos7-oj11/Dockerfile | 3 +-- testing/centos7-oj17/Dockerfile | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/testing/centos7-oj11/Dockerfile b/testing/centos7-oj11/Dockerfile index 80d6d684..60ed775a 100644 --- a/testing/centos7-oj11/Dockerfile +++ b/testing/centos7-oj11/Dockerfile @@ -31,8 +31,7 @@ RUN \ \ # install supervisor yum --enablerepo=extras install -y setuptools epel-release && \ - yum install -y python-pip && \ - pip install supervisor && \ + yum install -y supervisor && \ \ # install commonly needed packages yum install -y \ diff --git a/testing/centos7-oj17/Dockerfile b/testing/centos7-oj17/Dockerfile index a3d06430..4b08a3a1 100644 --- a/testing/centos7-oj17/Dockerfile +++ b/testing/centos7-oj17/Dockerfile @@ -31,8 +31,7 @@ RUN \ \ # install supervisor yum --enablerepo=extras install -y setuptools epel-release && \ - yum install -y python-pip && \ - pip install supervisor && \ + yum install -y supervisor && \ \ # install commonly needed packages yum install -y \ From 824b4de7647fc85fde35f4a5ef75625cc574bf00 Mon Sep 17 00:00:00 2001 From: Yuya Ebihara Date: Fri, 24 May 2024 07:20:09 +0900 Subject: [PATCH 2/2] Update Hive to 3.1.3 Also, update the download link. --- testing/hive3.1-hive/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testing/hive3.1-hive/Dockerfile b/testing/hive3.1-hive/Dockerfile index 96f2d899..17c4c12d 100644 --- a/testing/hive3.1-hive/Dockerfile +++ b/testing/hive3.1-hive/Dockerfile @@ -36,11 +36,11 @@ RUN yum install -y \ ENV JAVA_HOME=/usr/lib/jvm/zulu-8 ARG HADOOP_VERSION=3.1.2 -ARG HIVE_VERSION=3.1.2 +ARG HIVE_VERSION=3.1.3 # TODO Apache Archive is rate limited -- these should probably go in S3 ARG HADOOP_BINARY_PATH=https://archive.apache.org/dist/hadoop/common/hadoop-$HADOOP_VERSION/hadoop-$HADOOP_VERSION.tar.gz -ARG HIVE_BINARY_PATH=https://downloads.apache.org/hive/hive-$HIVE_VERSION/apache-hive-$HIVE_VERSION-bin.tar.gz +ARG HIVE_BINARY_PATH=https://dlcdn.apache.org/hive/hive-$HIVE_VERSION/apache-hive-$HIVE_VERSION-bin.tar.gz RUN curl -fLsS -o /tmp/hadoop.tar.gz --url $HADOOP_BINARY_PATH && \ tar xzf /tmp/hadoop.tar.gz --directory /opt && mv /opt/hadoop-$HADOOP_VERSION /opt/hadoop