Skip to content

Commit dad7f89

Browse files
committed
chore: align sbom suffixes
1 parent 7271e94 commit dad7f89

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

nifi/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ for nar in $NARS; do
6969
match=$(grep "\/$nar\/target\/bom.json" bomlist.txt || true)
7070
if [[ -n "$match" ]]; then
7171
# Copy the SBOM of the NAR
72-
cp "$match" "/stackable/$nar.cdx.json"
72+
cp "$match" "/stackable/nifi-${PRODUCT}/$nar.cdx.json"
7373
fi
7474
done
7575

@@ -114,15 +114,15 @@ if [[ "${PRODUCT}" != 1.* ]] ; then
114114
cp ./nifi-iceberg-services-api-nar/target/nifi-iceberg-services-api-nar-${NIFI_ICEBERG_BUNDLE}.nar /stackable
115115
cp ./nifi-iceberg-services-nar/target/nifi-iceberg-services-nar-${NIFI_ICEBERG_BUNDLE}.nar /stackable
116116
cp ./nifi-iceberg-processors-nar/target/nifi-iceberg-processors-nar-${NIFI_ICEBERG_BUNDLE}.nar /stackable
117-
cp ./target/bom.json /stackable/nifi-iceberg-bundle.sbom.json
117+
cp ./target/bom.json /stackable/nifi-iceberg-bundle.cdx.json
118118

119119
cd ..
120120
# Save disk space, even for intermediate images
121121
rm -rf nifi-iceberg-bundle-${NIFI_ICEBERG_BUNDLE}
122122

123123
# Set correct groups
124124
chmod g=u /stackable/*.nar
125-
chmod g=u /stackable/*.sbom.json
125+
chmod g=u /stackable/*.cdx.json
126126
fi
127127
EOF
128128

@@ -143,7 +143,7 @@ LABEL name="Apache NiFi" \
143143
COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-builder /stackable/nifi-${PRODUCT} /stackable/nifi-${PRODUCT}/
144144
COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-builder /stackable/stackable-bcrypt.jar /stackable/stackable-bcrypt.jar
145145
COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-iceberg-bundle-builder /stackable/*.nar /stackable/nifi-${PRODUCT}/lib/
146-
COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-iceberg-bundle-builder /stackable/*.sbom.json /stackable/nifi-${PRODUCT}/lib/
146+
COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-iceberg-bundle-builder /stackable/*.cdx.json /stackable/nifi-${PRODUCT}/lib/
147147
COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-builder /stackable/git-sync /stackable/git-sync
148148

149149
COPY --chown=${STACKABLE_USER_UID}:0 nifi/stackable/bin /stackable/bin

0 commit comments

Comments
 (0)