From 74685a08f4563c088a28a915c2169bcef03b336a Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Thu, 17 Apr 2025 16:05:11 +0200 Subject: [PATCH 1/7] feat(nifi): Add nifi-iceberg-bundle --- nifi/Dockerfile | 41 +++++++++++++++++++++++++++++++++++++++++ nifi/versions.py | 1 + 2 files changed, 42 insertions(+) diff --git a/nifi/Dockerfile b/nifi/Dockerfile index 93daaa019..3eb92f71e 100644 --- a/nifi/Dockerfile +++ b/nifi/Dockerfile @@ -80,6 +80,46 @@ rm -rf /stackable/nifi-${PRODUCT}/docs chmod -R g=u /stackable EOF +FROM stackable/image/java-devel AS nifi-iceberg-bundle-builder + +ARG NIFI_ICEBERG_BUNDLE +ARG PRODUCT +ARG STACKABLE_USER_UID + +USER ${STACKABLE_USER_UID} +WORKDIR /build + +RUN < Date: Thu, 17 Apr 2025 16:06:35 +0200 Subject: [PATCH 2/7] changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a15846112..d429aa0f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ All notable changes to this project will be documented in this file. `check-permissions-ownership.sh` provided in stackable-base image ([#1025]). - zookeeper: check for correct permissions and ownerships in /stackable folder via `check-permissions-ownership.sh` provided in stackable-base image ([#1043]). +- nifi: Add [nifi-iceberg-bundle](https://github.com/stackabletech/nifi-iceberg-bundle) for NiFi `2.2.0` ([#1060]). ### Changed @@ -75,6 +76,7 @@ All notable changes to this project will be documented in this file. [#1054]: https://github.com/stackabletech/docker-images/pull/1054 [#1055]: https://github.com/stackabletech/docker-images/pull/1055 [#1056]: https://github.com/stackabletech/docker-images/pull/1056 +[#1060]: https://github.com/stackabletech/docker-images/pull/1060 ## [25.3.0] - 2025-03-21 From d0519c77c2535d5204567b0a861f4167b2f36b35 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Thu, 24 Apr 2025 10:13:30 +0200 Subject: [PATCH 3/7] Add SBOM to final image --- nifi/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nifi/Dockerfile b/nifi/Dockerfile index 3eb92f71e..6c60d5f9d 100644 --- a/nifi/Dockerfile +++ b/nifi/Dockerfile @@ -110,6 +110,7 @@ if [[ "${PRODUCT}" != 1.* ]] ; then cp ./nifi-iceberg-services-api-nar/target/nifi-iceberg-services-api-nar-${NIFI_ICEBERG_BUNDLE}.nar /stackable cp ./nifi-iceberg-services-nar/target/nifi-iceberg-services-nar-${NIFI_ICEBERG_BUNDLE}.nar /stackable cp ./nifi-iceberg-processors-nar/target/nifi-iceberg-processors-nar-${NIFI_ICEBERG_BUNDLE}.nar /stackable + cp ./target/bom.json /stackable/nifi-iceberg-bundle.sbom.json cd .. # Save disk space, even for intermediate images @@ -117,6 +118,7 @@ if [[ "${PRODUCT}" != 1.* ]] ; then # Set correct groups chmod g=u /stackable/*.nar +chmod g=u /stackable/*.sbom.json fi EOF @@ -137,6 +139,7 @@ LABEL name="Apache NiFi" \ COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-builder /stackable/nifi-${PRODUCT} /stackable/nifi-${PRODUCT}/ COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-builder /stackable/stackable-bcrypt.jar /stackable/stackable-bcrypt.jar COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-iceberg-bundle-builder /stackable/*.nar /stackable/nifi-${PRODUCT}/lib/ +COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-iceberg-bundle-builder /stackable/*.sbom.json /stackable/nifi-${PRODUCT}/lib/ COPY --chown=${STACKABLE_USER_UID}:0 nifi/stackable/bin /stackable/bin COPY --chown=${STACKABLE_USER_UID}:0 nifi/licenses /licenses From c7839e77c3bd98ce180906699a5d1d1b8aa369da Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Tue, 29 Apr 2025 11:50:48 +0200 Subject: [PATCH 4/7] Use version 0.0.1 --- nifi/Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/nifi/Dockerfile b/nifi/Dockerfile index 6c60d5f9d..2ebf359cb 100644 --- a/nifi/Dockerfile +++ b/nifi/Dockerfile @@ -92,11 +92,10 @@ WORKDIR /build RUN < Date: Tue, 29 Apr 2025 12:04:14 +0200 Subject: [PATCH 5/7] hadolint --- nifi/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi/Dockerfile b/nifi/Dockerfile index 2ebf359cb..8662243aa 100644 --- a/nifi/Dockerfile +++ b/nifi/Dockerfile @@ -95,7 +95,7 @@ mkdir -p /stackable # NiFI 1.x natively supports Iceberg, no need to build an iceberg-bundle for it if [[ "${PRODUCT}" != 1.* ]] ; then curl "https://github.com/stackabletech/nifi-iceberg-bundle/archive/refs/tags/${NIFI_ICEBERG_BUNDLE}.tar.gz" | tar -xzC . - cd nifi-iceberg-bundle-${NIFI_ICEBERG_BUNDLE} + cd nifi-iceberg-bundle-${NIFI_ICEBERG_BUNDLE} || exit mvn \ --batch-mode \ From 24c042213c7709efe92620bc5fb9460bc36da3e8 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Fri, 2 May 2025 09:03:03 +0200 Subject: [PATCH 6/7] Bump to 0.0.2 --- nifi/versions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi/versions.py b/nifi/versions.py index 072ae5547..a0cbfa699 100644 --- a/nifi/versions.py +++ b/nifi/versions.py @@ -13,6 +13,6 @@ "product": "2.2.0", "java-base": "21", "java-devel": "21", - "nifi_iceberg_bundle": "0.0.1", + "nifi_iceberg_bundle": "0.0.2", }, ] From 3aa6aa4cd71a86eb26ec059bc1cb874d75ff39cb Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Tue, 6 May 2025 15:04:30 +0200 Subject: [PATCH 7/7] Bump to 0.0.3 --- nifi/versions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi/versions.py b/nifi/versions.py index a0cbfa699..9f7ae285c 100644 --- a/nifi/versions.py +++ b/nifi/versions.py @@ -13,6 +13,6 @@ "product": "2.2.0", "java-base": "21", "java-devel": "21", - "nifi_iceberg_bundle": "0.0.2", + "nifi_iceberg_bundle": "0.0.3", }, ]