From 933c16244ad3df3ded348aa5b1d5cd353a8c1cfe Mon Sep 17 00:00:00 2001 From: openeuler_bot Date: Sat, 6 Dec 2025 00:23:40 +0000 Subject: [PATCH] 24.03-lts-sp2 update drill to 1.22.0 --- Storage/drill/1.22.0/24.03-lts-sp2/Dockerfile | 37 +++++++++++++++++++ Storage/drill/1.22.0/24.03-lts-sp2/drill.ini | 2 + .../drill/1.22.0/24.03-lts-sp2/entrypoint.sh | 28 ++++++++++++++ Storage/drill/README.md | 1 + Storage/drill/doc/image-info.yml | 1 + Storage/drill/meta.yml | 4 +- 6 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 Storage/drill/1.22.0/24.03-lts-sp2/Dockerfile create mode 100644 Storage/drill/1.22.0/24.03-lts-sp2/drill.ini create mode 100644 Storage/drill/1.22.0/24.03-lts-sp2/entrypoint.sh diff --git a/Storage/drill/1.22.0/24.03-lts-sp2/Dockerfile b/Storage/drill/1.22.0/24.03-lts-sp2/Dockerfile new file mode 100644 index 00000000..8cce651b --- /dev/null +++ b/Storage/drill/1.22.0/24.03-lts-sp2/Dockerfile @@ -0,0 +1,37 @@ +ARG BASE=openeuler/openeuler:24.03-lts-sp2 +FROM ${BASE} + +ARG VERSION=1.22.0 + + +ARG PACKAGE=apache-drill-${VERSION}.tar.gz +ARG PACKAGE_RUL=https://dlcdn.apache.org/drill/${VERSION}/${PACKAGE} + +ENV DRILL_HEAP=900M +ENV ZOOKEEPER_HOST=zookeeper +ENV PATH $PATH:/apache-drill/bin:/zookeeper/bin + +WORKDIR / +RUN dnf install -y java-1.8.0-openjdk-devel supervisor which && \ + yum clean all && \ + mkdir -p /etc/supervisor.d + +RUN curl -fSL -o "${PACKAGE}" "$PACKAGE_RUL" && \ + tar zxf "${PACKAGE}" && \ + test -d "apache-drill-${VERSION}" && \ + rm -fv "${PACKAGE}" && \ + ln -sv "apache-drill-${VERSION}" apache-drill + +COPY entrypoint.sh / +COPY drill.ini /etc/supervisor.d/ +RUN sed -i -e "s/-Xms1G/-Xms\$DRILL_MAX_HEAP/" apache-drill/conf/drill-env.sh && \ + sed -i -e "s/^DRILL_MAX_HEAP=.*/DRILL_MAX_HEAP=\"${DRILL_HEAP}\"/" apache-drill/conf/drill-env.sh && \ + sed -i -e "s/^DRILL_HEAP=.*/DRILL_HEAP=\"${DRILL_HEAP}\"/" apache-drill/conf/drill-env.sh && \ + sed -i -e "s/^\([[:space:]]*\)zk.connect:.*/\\1zk.connect: \"${ZOOKEEPER_HOST}\"/" apache-drill/conf/drill-override.conf && \ + chmod 755 /entrypoint.sh + + + +EXPOSE 8047 + +CMD ["/entrypoint.sh"] \ No newline at end of file diff --git a/Storage/drill/1.22.0/24.03-lts-sp2/drill.ini b/Storage/drill/1.22.0/24.03-lts-sp2/drill.ini new file mode 100644 index 00000000..eb655ac9 --- /dev/null +++ b/Storage/drill/1.22.0/24.03-lts-sp2/drill.ini @@ -0,0 +1,2 @@ +[program:drill] +command=sh -c '/apache-drill/bin/drillbit.sh start && sleep 2 && tail -f /dev/null /apache-drill/log/*' \ No newline at end of file diff --git a/Storage/drill/1.22.0/24.03-lts-sp2/entrypoint.sh b/Storage/drill/1.22.0/24.03-lts-sp2/entrypoint.sh new file mode 100644 index 00000000..14d57b17 --- /dev/null +++ b/Storage/drill/1.22.0/24.03-lts-sp2/entrypoint.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env bash + +set -euo pipefail +[ -n "${DEBUG:-}" ] && set -x + +export JAVA_HOME="${JAVA_HOME:-/usr}" +export DRILL_HEAP="${DRILL_HEAP:-900M}" +export ZOOKEEPER_HOST="${ZOOKEEPER_HOST:-zookeeper}" + +sed -i -e "s/-Xms1G/-Xms\$DRILL_MAX_HEAP/" apache-drill/conf/drill-env.sh +sed -i -e "s/^DRILL_MAX_HEAP=.*/DRILL_MAX_HEAP=\"${DRILL_HEAP}\"/" apache-drill/conf/drill-env.sh + +sed -i -e "s/^DRILL_HEAP=.*/DRILL_HEAP=\"${DRILL_HEAP}\"/" apache-drill/conf/drill-env.sh +sed -i -e "s/^\\([[:space:]]*\\)zk.connect:.*/\\1zk.connect: \"${ZOOKEEPER_HOST}\"/" apache-drill/conf/drill-override.conf + +if [ -t 0 ]; then + sqlline -u jdbc:drill:zk=local +else + echo " +Running non-interactively, will not open Apache Drill SQL shell + +For Apache Drill shell start this image with 'docker run -t -i' switches + +Otherwise you will need to have a separate ZooKeeper container linked (one is available from harisekhon/zookeeper) and specify: + +docker run -e ZOOKEEPER_HOST=:2181 supervisord -n +" +fi \ No newline at end of file diff --git a/Storage/drill/README.md b/Storage/drill/README.md index d1e2279d..2fb1981c 100644 --- a/Storage/drill/README.md +++ b/Storage/drill/README.md @@ -18,6 +18,7 @@ The tag of each `drill` docker image is consist of the version of `drill` and th | Tag | Currently | Architectures | |-----------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------|---------------| +|[1.22.0-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Storage/drill/1.22.0/24.03-lts-sp2/Dockerfile) | drill 1.22.0 on openEuler 24.03-LTS-SP2 | amd64, arm64 | | [1.21.2-oe2403sp1](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Storage/drill/1.21.2/24.03-lts-sp1/Dockerfile) | Apache Drill 1.21.2 on openEuler 24.03-LTS-SP1 | amd64, arm64 | # Usage diff --git a/Storage/drill/doc/image-info.yml b/Storage/drill/doc/image-info.yml index 345e9e05..dc2807b2 100644 --- a/Storage/drill/doc/image-info.yml +++ b/Storage/drill/doc/image-info.yml @@ -11,6 +11,7 @@ tags: | | Tag | Currently | Architectures | |----------|-------------|------------------| + |[1.22.0-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Storage/drill/1.22.0/24.03-lts-sp2/Dockerfile) | drill 1.22.0 on openEuler 24.03-LTS-SP2 | amd64, arm64 | |[1.21.2-oe2403sp1](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Storage/drill/1.21.2/24.03-lts-sp1/Dockerfile)| Apache Drill 1.21.2 on openEuler 24.03-LTS-SP1 | amd64, arm64 | download: | diff --git a/Storage/drill/meta.yml b/Storage/drill/meta.yml index efbe5a31..d3c095fc 100644 --- a/Storage/drill/meta.yml +++ b/Storage/drill/meta.yml @@ -1,4 +1,6 @@ 1.21.2-oe2403sp1: path: 1.21.2/24.03-lts-sp1/Dockerfile 1.22.0-oe2403sp1: - path: 1.22.0/24.03-lts-sp1/Dockerfile \ No newline at end of file + path: 1.22.0/24.03-lts-sp1/Dockerfile +1.22.0-oe2403sp2: + path: 1.22.0/24.03-lts-sp2/Dockerfile \ No newline at end of file -- Gitee