From 56f157abd3f7a6465122a75b41f694172fa5c1e3 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Tue, 28 Mar 2023 15:31:28 +0200 Subject: [PATCH 1/8] hbase: Add krb5-workstation and openssl packages --- hbase/CHANGELOG.md | 8 ++++++++ hbase/Dockerfile | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/hbase/CHANGELOG.md b/hbase/CHANGELOG.md index 13646cc0d..e224fa992 100644 --- a/hbase/CHANGELOG.md +++ b/hbase/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [Unreleased] + +### Added + +- Add krb5-workstation and openssl packages - needed for Kerberos support ([#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..c94326ab2 100644 --- a/hbase/Dockerfile +++ b/hbase/Dockerfile @@ -18,7 +18,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 && \ From 4ff763e4d86edffe41d4ea35a7087b424380cc81 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Fri, 31 Mar 2023 08:24:12 +0200 Subject: [PATCH 2/8] Add versions and --- hbase/CHANGELOG.md | 1 + image_tools/conf.py | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/hbase/CHANGELOG.md b/hbase/CHANGELOG.md index e224fa992..2bc51364e 100644 --- a/hbase/CHANGELOG.md +++ b/hbase/CHANGELOG.md @@ -4,6 +4,7 @@ ### Added +- Add versions `2.5.3` and `2.5.3-hadoop3` ([#352]). - Add krb5-workstation and openssl packages - needed for Kerberos support ([#352]). [#352]: https://github.com/stackabletech/docker-images/pull/352 diff --git a/image_tools/conf.py b/image_tools/conf.py index 1dc2da1cd..65f159855 100644 --- a/image_tools/conf.py +++ b/image_tools/conf.py @@ -86,6 +86,16 @@ 'java-base': '11', 'phoenix': '2.4-5.1.2', }, + { + 'product': '2.5.3', + 'java-base': '11', + 'phoenix': '2.5-5.1.3', + }, + { + 'product': '2.5.3-hadoop3', + 'java-base': '11', + 'phoenix': '2.5-5.1.3', + }, ] }, { From 24db6b050ef935e6af44455ab432d04e10d50e4c Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 26 Apr 2023 10:27:32 +0200 Subject: [PATCH 3/8] hbase: Add 2.4.17 --- hbase/CHANGELOG.md | 2 +- image_tools/conf.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hbase/CHANGELOG.md b/hbase/CHANGELOG.md index 2bc51364e..21b316552 100644 --- a/hbase/CHANGELOG.md +++ b/hbase/CHANGELOG.md @@ -4,7 +4,7 @@ ### Added -- Add versions `2.5.3` and `2.5.3-hadoop3` ([#352]). +- 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]). [#352]: https://github.com/stackabletech/docker-images/pull/352 diff --git a/image_tools/conf.py b/image_tools/conf.py index 70431924c..1559b506d 100644 --- a/image_tools/conf.py +++ b/image_tools/conf.py @@ -86,6 +86,11 @@ "java-base": "11", "phoenix": "2.4-5.1.2", }, + { + "product": "2.4.17", + "java-base": "11", + "phoenix": "2.4-5.1.2", + }, { 'product': '2.5.3', 'java-base': '11', From 1eb4f88c999acd5b3bc262f12d12e1f62a23cb66 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 26 Apr 2023 11:51:45 +0200 Subject: [PATCH 4/8] Bump phoenix to 5.1.3 --- image_tools/conf.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/image_tools/conf.py b/image_tools/conf.py index 1559b506d..050b78bf6 100644 --- a/image_tools/conf.py +++ b/image_tools/conf.py @@ -64,32 +64,32 @@ { "product": "2.4.6", "java-base": "11", - "phoenix": "2.4-5.1.2", + "phoenix": "2.4-5.1.3", }, { "product": "2.4.8", "java-base": "11", - "phoenix": "2.4-5.1.2", + "phoenix": "2.4-5.1.3", }, { "product": "2.4.9", "java-base": "11", - "phoenix": "2.4-5.1.2", + "phoenix": "2.4-5.1.3", }, { "product": "2.4.11", "java-base": "11", - "phoenix": "2.4-5.1.2", + "phoenix": "2.4-5.1.3", }, { "product": "2.4.12", "java-base": "11", - "phoenix": "2.4-5.1.2", + "phoenix": "2.4-5.1.3", }, { "product": "2.4.17", "java-base": "11", - "phoenix": "2.4-5.1.2", + "phoenix": "2.4-5.1.3", }, { 'product': '2.5.3', From c1bdba3aecb12fd66d4fd7397f0e627d79bbcbc2 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 26 Apr 2023 14:12:26 +0200 Subject: [PATCH 5/8] Update CHANGELOG.md --- hbase/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/hbase/CHANGELOG.md b/hbase/CHANGELOG.md index 21b316552..459d84c38 100644 --- a/hbase/CHANGELOG.md +++ b/hbase/CHANGELOG.md @@ -13,6 +13,7 @@ ### Changed +- Bump to Apache Phoenix `5.1.3 ([#352]). - Upgraded to the base image java-base:11-stackable0.3.0. The java-base image contains a layer which provides Vector. The creation of the stackable user and group happens in the stackable-base layer and is therefore removed from From a2426133379d5b8219eb75355b7b6e7bbd9e7b02 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 26 Apr 2023 14:12:53 +0200 Subject: [PATCH 6/8] Update CHANGELOG.md --- hbase/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hbase/CHANGELOG.md b/hbase/CHANGELOG.md index 459d84c38..bea391269 100644 --- a/hbase/CHANGELOG.md +++ b/hbase/CHANGELOG.md @@ -13,7 +13,7 @@ ### Changed -- Bump to Apache Phoenix `5.1.3 ([#352]). +- Bump to Apache Phoenix `5.1.3` ([#352]). - Upgraded to the base image java-base:11-stackable0.3.0. The java-base image contains a layer which provides Vector. The creation of the stackable user and group happens in the stackable-base layer and is therefore removed from From 7d31cf4bc5bfab86027abda88cbceb45504e1ee2 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 26 Apr 2023 14:13:33 +0200 Subject: [PATCH 7/8] Update CHANGELOG.md --- hbase/CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hbase/CHANGELOG.md b/hbase/CHANGELOG.md index bea391269..6550e7aed 100644 --- a/hbase/CHANGELOG.md +++ b/hbase/CHANGELOG.md @@ -7,13 +7,16 @@ - 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]). +### 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 -- Bump to Apache Phoenix `5.1.3` ([#352]). - Upgraded to the base image java-base:11-stackable0.3.0. The java-base image contains a layer which provides Vector. The creation of the stackable user and group happens in the stackable-base layer and is therefore removed from From 15a3693e67fbc2abb5b1acbc965af1ef75246304 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Thu, 27 Apr 2023 10:54:28 +0200 Subject: [PATCH 8/8] Add jackson-dataformat-xml to hbase image --- hbase/CHANGELOG.md | 1 + hbase/Dockerfile | 6 +++++- image_tools/conf.py | 8 ++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/hbase/CHANGELOG.md b/hbase/CHANGELOG.md index 6550e7aed..541f21f74 100644 --- a/hbase/CHANGELOG.md +++ b/hbase/CHANGELOG.md @@ -6,6 +6,7 @@ - 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 diff --git a/hbase/Dockerfile b/hbase/Dockerfile index c94326ab2..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" \ @@ -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 050b78bf6..3f749f0dc 100644 --- a/image_tools/conf.py +++ b/image_tools/conf.py @@ -65,41 +65,49 @@ "product": "2.4.6", "java-base": "11", "phoenix": "2.4-5.1.3", + 'jackson_dataformat_xml': '2.14.1', }, { "product": "2.4.8", "java-base": "11", "phoenix": "2.4-5.1.3", + 'jackson_dataformat_xml': '2.14.1', }, { "product": "2.4.9", "java-base": "11", "phoenix": "2.4-5.1.3", + 'jackson_dataformat_xml': '2.14.1', }, { "product": "2.4.11", "java-base": "11", "phoenix": "2.4-5.1.3", + 'jackson_dataformat_xml': '2.14.1', }, { "product": "2.4.12", "java-base": "11", "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', }, ], },