Skip to content

Commit 51956c7

Browse files
feat(nifi): Add git-sync
1 parent 73dcb3f commit 51956c7

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ All notable changes to this project will be documented in this file.
2121
`check-permissions-ownership.sh` provided in stackable-base image ([#1041]).
2222
- nifi: check for correct permissions and ownerships in /stackable folder via
2323
`check-permissions-ownership.sh` provided in stackable-base image ([#1027]).
24+
- nifi: add git-sync ([#1107]).
2425
- opa: check for correct permissions and ownerships in /stackable folder via
2526
`check-permissions-ownership.sh` provided in stackable-base image ([#1038]).
2627
- opa: Add `1.4.2` ([#1103]).
@@ -102,6 +103,7 @@ All notable changes to this project will be documented in this file.
102103
[#1102]: https://github.com/stackabletech/docker-images/pull/1102
103104
[#1103]: https://github.com/stackabletech/docker-images/pull/1103
104105
[#1106]: https://github.com/stackabletech/docker-images/pull/1106
106+
[#1107]: https://github.com/stackabletech/docker-images/pull/1107
105107

106108
## [25.3.0] - 2025-03-21
107109

nifi/Dockerfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# syntax=docker/dockerfile:1.10.0@sha256:865e5dd094beca432e8c0a1d5e1c465db5f998dca4e439981029b3b81fb39ed5
2-
# check=error=true
2+
# check=error=true;skip=InvalidDefaultArgInFrom
3+
4+
ARG GIT_SYNC
5+
6+
FROM oci.stackable.tech/sdp/git-sync/git-sync:${GIT_SYNC} AS git-sync-image
37

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

@@ -31,6 +35,7 @@ USER ${STACKABLE_USER_UID}
3135
WORKDIR /stackable
3236

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

3540
RUN <<EOF
3641
# 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.
@@ -122,6 +127,7 @@ COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-builder /stackable/nifi-${PRODU
122127
COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-builder /stackable/stackable-bcrypt.jar /stackable/stackable-bcrypt.jar
123128
COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-iceberg-bundle-builder /stackable/*.nar /stackable/nifi-${PRODUCT}/lib/
124129
COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-iceberg-bundle-builder /stackable/*.sbom.json /stackable/nifi-${PRODUCT}/lib/
130+
COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-builder /stackable/git-sync /stackable/git-sync
125131

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

139+
# git: Required for git-sync
133140
# python-pip: Required to install Python packages
134141
# Note: Python is also required for the Python processors (ExecuteScript and other for NiFi < 2.0 and custom Python processors for NiFi > 2.0)
135142
microdnf install \
143+
git \
136144
python-pip
137145

138146
microdnf clean all

nifi/versions.py

+3
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,19 @@
33
"product": "1.27.0",
44
"java-base": "11",
55
"java-devel": "11", # There is an error when trying to use the jdk 21 (since nifi 1.26.0)
6+
"git_sync": "v4.4.0",
67
},
78
{
89
"product": "1.28.1",
910
"java-base": "11",
1011
"java-devel": "11",
12+
"git_sync": "v4.4.0",
1113
},
1214
{
1315
"product": "2.2.0",
1416
"java-base": "21",
1517
"java-devel": "21",
18+
"git_sync": "v4.4.0",
1619
"nifi_iceberg_bundle": "0.0.3",
1720
},
1821
]

0 commit comments

Comments
 (0)