diff --git a/hbase/CHANGELOG.md b/hbase/CHANGELOG.md index 984ed57e5..541f21f74 100644 --- a/hbase/CHANGELOG.md +++ b/hbase/CHANGELOG.md @@ -2,6 +2,18 @@ ## [Unreleased] +### Added + +- Add versions `2.4.17`, `2.5.3` and `2.5.3-hadoop3` ([#352]). +- Add krb5-workstation and openssl packages - needed for Kerberos support ([#352]). +- Add `jackson-dataformat-xml` library (used for logging) ([#352]). + +### Changed + +- Bump to Apache Phoenix `5.1.3` ([#352]). + +[#352]: https://github.com/stackabletech/docker-images/pull/352 + ## [hbase2.4.6-stackable0.9.0] [hbase2.4.8-stackable0.9.0] [hbase2.4.9-stackable0.9.0] [hbase2.4.11-stackable0.9.0] [hbase2.4.12-stackable0.4.0] - 2022-12-21 ### Changed diff --git a/hbase/Dockerfile b/hbase/Dockerfile index 9f46b3936..4ab7c9a5f 100644 --- a/hbase/Dockerfile +++ b/hbase/Dockerfile @@ -3,6 +3,7 @@ FROM stackable/image/java-base ARG PRODUCT ARG PHOENIX +ARG JACKSON_DATAFORMAT_XML ARG RELEASE LABEL name="Apache HBase" \ @@ -18,7 +19,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN microdnf update && \ microdnf install tar gzip zip && \ - microdnf install python3 python3-pip && \ + microdnf install python3 python3-pip krb5-workstation openssl && \ microdnf clean all RUN ln -s /usr/bin/python3 /usr/bin/python && \ @@ -39,7 +40,10 @@ RUN curl -L https://repo.stackable.tech/repository/packages/hbase/hbase-${PRODUC chmod -x /stackable/jmx/jmx_prometheus_javaagent-0.16.1.jar && \ curl -L https://repo.stackable.tech/repository/packages/phoenix/phoenix-hbase-${PHOENIX}-bin.tar.gz | tar -xzC . && \ ln -s /stackable/phoenix-hbase-${PHOENIX}-bin /stackable/phoenix && \ - ln -s /stackable/phoenix/phoenix-server-hbase-${PHOENIX}.jar /stackable/hbase/lib/phoenix-server-hbase-${PHOENIX}.jar + ln -s /stackable/phoenix/phoenix-server-hbase-${PHOENIX}.jar /stackable/hbase/lib/phoenix-server-hbase-${PHOENIX}.jar && \ + # Install jackson-dataformat-xml which is required for xml logging with log4j2 (starting from hbase version 2.5) + curl -L -o /stackable/hbase/lib/jackson-dataformat-xml-${JACKSON_DATAFORMAT_XML}.jar \ + https://repo.stackable.tech/repository/packages/jackson-dataformat-xml/jackson-dataformat-xml-${JACKSON_DATAFORMAT_XML}.jar ENV HBASE_CONF_DIR=/stackable/hbase/conf diff --git a/image_tools/conf.py b/image_tools/conf.py index 074666113..3f749f0dc 100644 --- a/image_tools/conf.py +++ b/image_tools/conf.py @@ -64,27 +64,50 @@ { "product": "2.4.6", "java-base": "11", - "phoenix": "2.4-5.1.2", + "phoenix": "2.4-5.1.3", + 'jackson_dataformat_xml': '2.14.1', }, { "product": "2.4.8", "java-base": "11", - "phoenix": "2.4-5.1.2", + "phoenix": "2.4-5.1.3", + 'jackson_dataformat_xml': '2.14.1', }, { "product": "2.4.9", "java-base": "11", - "phoenix": "2.4-5.1.2", + "phoenix": "2.4-5.1.3", + 'jackson_dataformat_xml': '2.14.1', }, { "product": "2.4.11", "java-base": "11", - "phoenix": "2.4-5.1.2", + "phoenix": "2.4-5.1.3", + 'jackson_dataformat_xml': '2.14.1', }, { "product": "2.4.12", "java-base": "11", - "phoenix": "2.4-5.1.2", + "phoenix": "2.4-5.1.3", + 'jackson_dataformat_xml': '2.14.1', + }, + { + "product": "2.4.17", + "java-base": "11", + "phoenix": "2.4-5.1.3", + 'jackson_dataformat_xml': '2.14.1', + }, + { + 'product': '2.5.3', + 'java-base': '11', + 'phoenix': '2.5-5.1.3', + 'jackson_dataformat_xml': '2.14.1', + }, + { + 'product': '2.5.3-hadoop3', + 'java-base': '11', + 'phoenix': '2.5-5.1.3', + 'jackson_dataformat_xml': '2.14.1', }, ], },