Merge remote-tracking branch 'origin/main' into feat/nifi-opa-authorizer

Author: labrenbe

nifi/Dockerfile

@@ -75,47 +75,6 @@ WORKDIR /build
 RUN <<EOF
 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} || exit
-
-    mvn \
-        --batch-mode \
-        --no-transfer-progress\
-        clean package \
-        -D nifi.version=${PRODUCT} \
-        -Dmaven.javadoc.skip=true \
-        -Denforcer.skip=true
-    # We need "-Denforcer.skip=true", as the Maven version is too old
-
-    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
-    rm -rf nifi-iceberg-bundle-${NIFI_ICEBERG_BUNDLE}
-
-# Set correct groups
-chmod g=u /stackable/*.nar
-chmod g=u /stackable/*.sbom.json
-fi
-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 <<EOF
-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 .