Skip to content

Commit

Permalink
Fix non-hermetic OCI TA builds
Browse files Browse the repository at this point in the history
  • Loading branch information
stuartwdouglas committed May 29, 2024
1 parent 0a28d1d commit cb50037
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions task/buildah-oci-ta/0.1/buildah-oci-ta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ spec:
BUILDAH_ARGS+=("--build-arg=$build_arg")
done
if [ -d "/var/workdir/cachi2" ]; then
if [ -f "/var/workdir/cachi2/cachi2.env" ]; then
cp -r "/var/workdir/cachi2" /tmp/
chmod -R go+rwX /tmp/cachi2
VOLUME_MOUNTS="--volume /tmp/cachi2:/cachi2"
Expand Down Expand Up @@ -267,7 +267,7 @@ spec:
echo $container > /var/workdir/container_name
# Save the SBOM produced by Cachi2 so it can be merged into the final SBOM later
if [ -d "/var/workdir/cachi2" ]; then
if [ -d "/var/workdir/cachi2/cachi2.env" ]; then
cp /tmp/cachi2/output/bom.json ./sbom-cachi2.json
fi
Expand Down Expand Up @@ -359,7 +359,7 @@ spec:
- name: merge-cachi2-sbom
image: quay.io/redhat-appstudio/cachi2:0.7.0@sha256:1fc772aa3636fd0b43d62120d832e5913843e028e8cac42814b487c3a0a32bd8
script: |
if [ -d "/var/workdir/cachi2" ]; then
if [ -d "/var/workdir/cachi2/cachi2.env" ]; then
echo "Merging contents of sbom-cachi2.json into sbom-cyclonedx.json"
/src/utils/merge_syft_sbom.py sbom-cachi2.json sbom-cyclonedx.json > sbom-temp.json
mv sbom-temp.json sbom-cyclonedx.json
Expand Down

0 comments on commit cb50037

Please sign in to comment.