Skip to content
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.

Sign up for GitHub

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

fix(KFLUXBUGS-1215): fix use of PREFETCH_INPUT #945

Merged
merged 1 commit into from
Apr 22, 2024
Merged

fix(KFLUXBUGS-1215): fix use of PREFETCH_INPUT #945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 4 additions & 7 deletions task/buildah-remote/0.1/buildah-remote.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,6 @@ spec:
value: vfs
- name: HERMETIC
value: $(params.HERMETIC)
- name: PREFETCH_INPUT
value: $(params.PREFETCH_INPUT)
- name: CONTEXT
value: $(params.CONTEXT)
- name: DOCKERFILE
Expand Down Expand Up @@ -245,8 +243,8 @@ spec:
BUILDAH_ARGS+=("--build-arg-file=${SOURCE_CODE_DIR}/${BUILD_ARGS_FILE}")
fi

if [ -n "${PREFETCH_INPUT}" ]; then
cp -r cachi2 /tmp/
if [ -d "$(workspaces.source.path)/cachi2" ]; then
cp -r "$(workspaces.source.path)/cachi2" /tmp/
chmod -R go+rwX /tmp/cachi2
VOLUME_MOUNTS="--volume /tmp/cachi2:/cachi2"
sed -i 's|^\s*run |RUN . /cachi2/cachi2.env \&\& \\\n |i' "$dockerfile_path"
Expand Down Expand Up @@ -301,7 +299,7 @@ spec:
echo $container > /workspace/container_name

# Save the SBOM produced by Cachi2 so it can be merged into the final SBOM later
if [ -n "${PREFETCH_INPUT}" ]; then
if [ -d "$(workspaces.source.path)/cachi2" ]; then
cp /tmp/cachi2/output/bom.json ./sbom-cachi2.json
fi

Expand All @@ -323,7 +321,6 @@ spec:
-e BUILDAH_FORMAT="$BUILDAH_FORMAT" \
-e STORAGE_DRIVER="$STORAGE_DRIVER" \
-e HERMETIC="$HERMETIC" \
-e PREFETCH_INPUT="$PREFETCH_INPUT" \
-e CONTEXT="$CONTEXT" \
-e DOCKERFILE="$DOCKERFILE" \
-e IMAGE="$IMAGE" \
Expand Down Expand Up @@ -428,7 +425,7 @@ spec:
image: quay.io/redhat-appstudio/cachi2:0.7.0@sha256:1fc772aa3636fd0b43d62120d832e5913843e028e8cac42814b487c3a0a32bd8
name: merge-cachi2-sbom
script: |
if [ -n "${PREFETCH_INPUT}" ]; then
if [ -d "$(workspaces.source.path)/cachi2" ]; 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
10 changes: 4 additions & 6 deletions task/buildah/0.1/buildah.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,6 @@ spec:
value: vfs
- name: HERMETIC
value: $(params.HERMETIC)
- name: PREFETCH_INPUT
value: $(params.PREFETCH_INPUT)
chmeliik marked this conversation as resolved.
Show resolved Hide resolved
- name: CONTEXT
value: $(params.CONTEXT)
- name: DOCKERFILE
Expand Down Expand Up @@ -197,8 +195,8 @@ spec:
BUILDAH_ARGS+=("--build-arg-file=${SOURCE_CODE_DIR}/${BUILD_ARGS_FILE}")
fi

if [ -n "${PREFETCH_INPUT}" ]; then
cp -r cachi2 /tmp/
if [ -d "$(workspaces.source.path)/cachi2" ]; then
cp -r "$(workspaces.source.path)/cachi2" /tmp/
chmod -R go+rwX /tmp/cachi2
VOLUME_MOUNTS="--volume /tmp/cachi2:/cachi2"
sed -i 's|^\s*run |RUN . /cachi2/cachi2.env \&\& \\\n |i' "$dockerfile_path"
Expand Down Expand Up @@ -253,7 +251,7 @@ spec:
echo $container > /workspace/container_name

# Save the SBOM produced by Cachi2 so it can be merged into the final SBOM later
if [ -n "${PREFETCH_INPUT}" ]; then
if [ -d "$(workspaces.source.path)/cachi2" ]; then
cp /tmp/cachi2/output/bom.json ./sbom-cachi2.json
fi

Expand Down Expand Up @@ -343,7 +341,7 @@ spec:
- name: merge-cachi2-sbom
image: quay.io/redhat-appstudio/cachi2:0.7.0@sha256:1fc772aa3636fd0b43d62120d832e5913843e028e8cac42814b487c3a0a32bd8
script: |
if [ -n "${PREFETCH_INPUT}" ]; then
if [ -d "$(workspaces.source.path)/cachi2" ]; 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