Skip to content

Commit 52806f5

Browse files
lfranckerazvan
andauthored
HBase 2.4.18 support (#740)
* HBase 2.4.18 support - Patches updated for new version - Update dependencies for 2.4.18 to new patch dependencies where available - Move to heredoc syntax - Remove Log4Shell workarounds - Add package_manifest - Change upload script to only download & upload the sources and not the binaries * Changelog update * Hopefully fix path issues * Fix build and make build less noisy * Update labels * Fix typo * Updates - Move Phoenix into its own stage - Add ARG to delete caches - Use cache mounts * Fix changelog, remove hadolint warnings * Separate the hadoop-builder from hbase-builder so they can build in parallel * Split HBase Operator Tools into own stage as well, fix errors wi * fix missing copy * Every cache is distinct * Try to silence hadolint * Add reason why hadolint is ignored --------- Co-authored-by: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
1 parent 548b0e6 commit 52806f5

File tree

11 files changed

+1016
-125
lines changed

11 files changed

+1016
-125
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ All notable changes to this project will be documented in this file.
3232
- airflow: Add version `2.8.4` and `2.9.2` ([#762]).
3333
- superset: Add version `3.1.3` and `4.0.2` ([#768]).
3434
- druid: Support for 30.0.0 using Java 17 ([#731])
35+
- hbase: Support for HBase 2.4.18 ([#740]).
3536

3637
### Changed
3738

@@ -121,6 +122,7 @@ All notable changes to this project will be documented in this file.
121122
[#734]: https://github.com/stackabletech/docker-images/pull/734
122123
[#736]: https://github.com/stackabletech/docker-images/pull/736
123124
[#737]: https://github.com/stackabletech/docker-images/pull/737
125+
[#740]: https://github.com/stackabletech/docker-images/pull/740
124126
[#743]: https://github.com/stackabletech/docker-images/pull/743
125127
[#744]: https://github.com/stackabletech/docker-images/pull/744
126128
[#745]: https://github.com/stackabletech/docker-images/pull/745

hadoop/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ COPY shared/log4shell_scanner /bin/log4shell_scanner
9191
RUN /bin/log4shell_scanner s "/stackable/hadoop-${PRODUCT}"
9292
# ===
9393

94-
FROM stackable/image/java-devel as hdfs-utils-builder
94+
FROM stackable/image/java-devel AS hdfs-utils-builder
9595

9696
ARG HDFS_UTILS
9797
ARG PRODUCT
@@ -110,7 +110,7 @@ RUN curl --fail -L "https://github.com/stackabletech/hdfs-utils/archive/refs/tag
110110
cp target/hdfs-utils-$HDFS_UTILS.jar /stackable/hadoop-${PRODUCT}/share/hadoop/common/lib/hdfs-utils-${HDFS_UTILS}.jar && \
111111
rm -rf /stackable/hdfs-utils-main
112112

113-
FROM stackable/image/java-base as final
113+
FROM stackable/image/java-base AS final
114114

115115
ARG PRODUCT
116116
ARG RELEASE

hbase/Dockerfile

Lines changed: 238 additions & 107 deletions
Large diffs are not rendered by default.
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
HBASE-27103 - fixes HBase build
2+
3+
From: Lars Francke <git@lars-francke.de>
4+
5+
6+
---
7+
.../src/main/resources/supplemental-models.xml | 14 ++++++++++++++
8+
1 file changed, 14 insertions(+)
9+
10+
diff --git a/hbase-resource-bundle/src/main/resources/supplemental-models.xml b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
11+
index 6a36b86dbc..cfcd8e201f 100644
12+
--- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml
13+
+++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
14+
@@ -2316,6 +2316,20 @@ Copyright (c) 2011 FuseSource Corp. All rights reserved.
15+
</licenses>
16+
</project>
17+
</supplement>
18+
+ <supplement>
19+
+ <project>
20+
+ <groupId>org.openlabtesting.leveldbjni</groupId>
21+
+ <artifactId>leveldbjni-all</artifactId>
22+
+
23+
+ <licenses>
24+
+ <license>
25+
+ <name>BSD 3-Clause License</name>
26+
+ <url>http://www.opensource.org/licenses/BSD-3-Clause</url>
27+
+ <distribution>repo</distribution>
28+
+ </license>
29+
+ </licenses>
30+
+ </project>
31+
+ </supplement>
32+
<!-- Category B licenses that need text in LICENSE and a NOTICE -->
33+
<supplement>
34+
<project>

0 commit comments

Comments
 (0)