Skip to content

Commit 6567adc

Browse files
feat(nifi): Add git-sync (#1107)
1 parent 0ddec74 commit 6567adc

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
@@ -25,6 +25,7 @@ All notable changes to this project will be documented in this file.
2525
`check-permissions-ownership.sh` provided in stackable-base image ([#1027]).
2626
- nifi: Add [nifi-iceberg-bundle] for NiFi `2.4.0` ([#1060], [#1106]).
2727
- nifi: Add `2.4.0` ([#1114]).
28+
- nifi: Add git-sync ([#1107]).
2829
- opa: check for correct permissions and ownerships in /stackable folder via
2930
`check-permissions-ownership.sh` provided in stackable-base image ([#1038]).
3031
- opa: Add `1.4.2` ([#1103]).
@@ -116,6 +117,7 @@ All notable changes to this project will be documented in this file.
116117
[#1102]: https://github.com/stackabletech/docker-images/pull/1102
117118
[#1103]: https://github.com/stackabletech/docker-images/pull/1103
118119
[#1106]: https://github.com/stackabletech/docker-images/pull/1106
120+
[#1107]: https://github.com/stackabletech/docker-images/pull/1107
119121
[#1108]: https://github.com/stackabletech/docker-images/pull/1108
120122
[#1110]: https://github.com/stackabletech/docker-images/pull/1110
121123
[#1114]: https://github.com/stackabletech/docker-images/pull/1114

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

@@ -32,6 +36,7 @@ WORKDIR /stackable
3236

3337
COPY --chown=${STACKABLE_USER_UID}:0 nifi/stackable/patches/patchable.toml /stackable/src/nifi/stackable/patches/patchable.toml
3438
COPY --chown=${STACKABLE_USER_UID}:0 nifi/stackable/patches/${PRODUCT} /stackable/src/nifi/stackable/patches/${PRODUCT}
39+
COPY --chown=${STACKABLE_USER_UID}:0 --from=git-sync-image /git-sync /stackable/git-sync
3540

3641
RUN <<EOF
3742
# 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.
@@ -125,6 +130,7 @@ COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-builder /stackable/nifi-${PRODU
125130
COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-builder /stackable/stackable-bcrypt.jar /stackable/stackable-bcrypt.jar
126131
COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-iceberg-bundle-builder /stackable/*.nar /stackable/nifi-${PRODUCT}/lib/
127132
COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-iceberg-bundle-builder /stackable/*.sbom.json /stackable/nifi-${PRODUCT}/lib/
133+
COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-builder /stackable/git-sync /stackable/git-sync
128134

129135
COPY --chown=${STACKABLE_USER_UID}:0 nifi/stackable/bin /stackable/bin
130136
COPY --chown=${STACKABLE_USER_UID}:0 nifi/licenses /licenses
@@ -133,9 +139,11 @@ COPY --chown=${STACKABLE_USER_UID}:0 nifi/python /stackable/python
133139
RUN <<EOF
134140
microdnf update
135141

142+
# git: Required for git-sync
136143
# python-pip: Required to install Python packages
137144
# Note: Python is also required for the Python processors (ExecuteScript and other for NiFi < 2.0 and custom Python processors for NiFi > 2.0)
138145
microdnf install \
146+
git \
139147
python-pip
140148

141149
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.4.0",
1416
"java-base": "21",
1517
"java-devel": "21",
18+
"git_sync": "v4.4.0",
1619
"nifi_iceberg_bundle": "0.0.4",
1720
},
1821
]

0 commit comments

Comments
 (0)