Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ All notable changes to this project will be documented in this file.
- opa: Add `1.8.0` ([#1279]).
- spark: Add `3.5.7` ([#1280]).
- spark-connect-client: Add `3.5.7` ([#1280]).
- superset: Add `4.1.4` ([#1284]).
- superset: Add `4.1.4` ([#1284]).
- spark: Add `4.0.1` ([#1286]).
- spark-connect-client: Add `4.0.1` ([#1286]).
- trino/trino-storage-connector: Add `477` ([#1285]).
Expand All @@ -43,6 +43,7 @@ All notable changes to this project will be documented in this file.
- trino-cli: Bump to 477 ([#1285]).
- tools: Bump dependency versions - kubectl to `1.34.1`, yq to `4.47.2`, and jq to `1.8.1` ([#1290]).
- testing-tools: Update keycloak dependency to `26.3.5` and `python:3.12-slim-bullseye` base image ([#1289]).
- hbase: move hbck2.env to hbase-operator-tools image and add log4j2 properties for this tool ([#1300]).

### Removed

Expand Down Expand Up @@ -89,6 +90,7 @@ All notable changes to this project will be documented in this file.
[#1292]: https://github.com/stackabletech/docker-images/pull/1292
[#1293]: https://github.com/stackabletech/docker-images/pull/1293
[#1296]: https://github.com/stackabletech/docker-images/pull/1296
[#1300]: https://github.com/stackabletech/docker-images/pull/1300

## [25.7.0] - 2025-07-23

Expand Down
6 changes: 5 additions & 1 deletion hbase/hbase-operator-tools/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@ ARG DELETE_CACHES="true"
# The variable names are intentionally passed to envsubst in single-quotes,
# so that they are not expanded. Disabling ShellCheck rules in a Dockerfile
# does not work, so please ignore the according warning (SC2016).
COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase/stackable/bin/hbck2.env /stackable/bin/
COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase-operator-tools/stackable/bin/hbck2.env /stackable/bin/
COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase-operator-tools/stackable/patches/patchable.toml /stackable/src/hbase/hbase-operator-tools/stackable/patches/patchable.toml
COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase-operator-tools/stackable/patches/${HBASE_OPERATOR_TOOLS_VERSION} /stackable/src/hbase/hbase-operator-tools/stackable/patches/${HBASE_OPERATOR_TOOLS_VERSION}
COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase/stackable/bin/hbase-entrypoint.sh /stackable/bin/
COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase-operator-tools/stackable/conf/log4j2-hbck.properties /tmp/log4j2-hbck.properties

COPY --from=hbase-builder --chown=${STACKABLE_USER_UID}:0 /stackable/patched-libs/maven/org/apache/hbase /stackable/patched-libs/maven/org/apache/hbase
COPY --from=hadoop-builder --chown=${STACKABLE_USER_UID}:0 /stackable/patched-libs/maven/org/apache/hadoop /stackable/patched-libs/maven/org/apache/hadoop
Expand Down Expand Up @@ -84,6 +85,9 @@ if [ "${DELETE_CACHES}" = "true" ] ; then
rm -rf /stackable/.cache/*
fi

mkdir -p /stackable/hbase-operator-tools-${FULL_HBASE_OPERATOR_TOOLS_VERSION}/conf
mv /tmp/log4j2-hbck.properties /stackable/hbase-operator-tools-${FULL_HBASE_OPERATOR_TOOLS_VERSION}/conf/log4j2-hbck.properties

# set correct groups
chmod --recursive g=u /stackable
EOF
2 changes: 2 additions & 0 deletions hbase/hbase/stackable/bin/hbck2.env → ...se-operator-tools/stackable/bin/hbck2.env
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/bin/sh

export LOG4J_CONFIGURATION_FILE=/stackable/hbase-operator-tools/conf/log4j2-hbck.properties

exec /stackable/hbase-${PATCHED_HBASE_VERSION}/bin/hbase hbck \
-j /stackable/hbase-operator-tools-${FULL_HBASE_OPERATOR_TOOLS_VERSION}/hbase-hbck2/hbase-hbck2-${PATCHED_HBASE_OPERATOR_TOOLS_VERSION}.jar \
"$@"
12 changes: 12 additions & 0 deletions hbase/hbase-operator-tools/stackable/conf/log4j2-hbck.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
status = warn
dest = err
name = PropertiesConfig

# Console appender
appender.console.type = Console
appender.console.target = SYSTEM_ERR
appender.console.name = console
appender.console.layout.type = PatternLayout
appender.console.layout.pattern = %d{ISO8601} %-5p [%t%notEmpty{ %X}] %c{2}: %.1000m%n

rootLogger = WARN,console
Loading