Skip to content

feat(nifi): Add git-sync #1107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ All notable changes to this project will be documented in this file.
`check-permissions-ownership.sh` provided in stackable-base image ([#1041]).
- nifi: check for correct permissions and ownerships in /stackable folder via
`check-permissions-ownership.sh` provided in stackable-base image ([#1027]).
- nifi: add git-sync ([#1107]).
- opa: check for correct permissions and ownerships in /stackable folder via
`check-permissions-ownership.sh` provided in stackable-base image ([#1038]).
- opa: Add `1.4.2` ([#1103]).
Expand Down Expand Up @@ -102,6 +103,7 @@ All notable changes to this project will be documented in this file.
[#1102]: https://github.com/stackabletech/docker-images/pull/1102
[#1103]: https://github.com/stackabletech/docker-images/pull/1103
[#1106]: https://github.com/stackabletech/docker-images/pull/1106
[#1107]: https://github.com/stackabletech/docker-images/pull/1107

## [25.3.0] - 2025-03-21

Expand Down
10 changes: 9 additions & 1 deletion nifi/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# syntax=docker/dockerfile:1.10.0@sha256:865e5dd094beca432e8c0a1d5e1c465db5f998dca4e439981029b3b81fb39ed5
# check=error=true
# check=error=true;skip=InvalidDefaultArgInFrom

ARG GIT_SYNC

FROM oci.stackable.tech/sdp/git-sync/git-sync:${GIT_SYNC} AS git-sync-image

FROM stackable/image/java-devel AS nifi-builder

Expand Down Expand Up @@ -31,6 +35,7 @@ USER ${STACKABLE_USER_UID}
WORKDIR /stackable

COPY --chown=${STACKABLE_USER_UID}:0 nifi/stackable/patches/${PRODUCT} /stackable/src/nifi/stackable/patches/${PRODUCT}
COPY --chown=${STACKABLE_USER_UID}:0 --from=git-sync-image /git-sync /stackable/git-sync

RUN <<EOF
# This used to be located in /bin/stackable-bcrypt.jar. We create a softlink for /bin/stackable-bcrypt.jar in the main container for backwards compatibility.
Expand Down Expand Up @@ -122,6 +127,7 @@ COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-builder /stackable/nifi-${PRODU
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 --from=nifi-builder /stackable/git-sync /stackable/git-sync

COPY --chown=${STACKABLE_USER_UID}:0 nifi/stackable/bin /stackable/bin
COPY --chown=${STACKABLE_USER_UID}:0 nifi/licenses /licenses
Expand All @@ -130,9 +136,11 @@ COPY --chown=${STACKABLE_USER_UID}:0 nifi/python /stackable/python
RUN <<EOF
microdnf update

# git: Required for git-sync
# python-pip: Required to install Python packages
# Note: Python is also required for the Python processors (ExecuteScript and other for NiFi < 2.0 and custom Python processors for NiFi > 2.0)
microdnf install \
git \
python-pip

microdnf clean all
Expand Down
3 changes: 3 additions & 0 deletions nifi/versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,19 @@
"product": "1.27.0",
"java-base": "11",
"java-devel": "11", # There is an error when trying to use the jdk 21 (since nifi 1.26.0)
"git_sync": "v4.4.0",
},
{
"product": "1.28.1",
"java-base": "11",
"java-devel": "11",
"git_sync": "v4.4.0",
},
{
"product": "2.2.0",
"java-base": "21",
"java-devel": "21",
"git_sync": "v4.4.0",
"nifi_iceberg_bundle": "0.0.3",
},
]