Skip to content

Commit b495155

Browse files
committed
Amazon corretto reports invalid
Problem: amazoncorretto:19.0.1-al2 reported validation failure. Solution: Reported upstraem to syft devs and fault fixed in v0.62.0. Upgraded version in Docker image. Additionally reported invalidation error in sbom_scraper.sh script. Signed-off-by: Paul Hewlett <[email protected]>
1 parent c746ce8 commit b495155

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

Dockerfile-scraper

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,17 @@ RUN apt-get update \
1616

1717
RUN python3 -m pip install yq
1818

19-
RUN curl -fsSOL https://github.com/CycloneDX/cyclonedx-cli/releases/download/v0.24.2/cyclonedx-linux-x64 \
19+
ENV CDX_VERSION 0.24.2
20+
ENV SYFT_VERSION 0.62.1
21+
22+
RUN curl -fsSOL https://github.com/CycloneDX/cyclonedx-cli/releases/download/v${CDX_VERSION}/cyclonedx-linux-x64 \
2023
&& mv cyclonedx-linux-x64 /usr/local/bin/cdx \
2124
&& chmod +x /usr/local/bin/cdx \
22-
&& curl -fsSOL https://github.com/anchore/syft/releases/download/v0.60.3/syft_0.60.3_linux_amd64.tar.gz \
23-
&& tar xvzf syft_0.60.3_linux_amd64.tar.gz syft \
25+
&& curl -fsSOL https://github.com/anchore/syft/releases/download/v${SYFT_VERSION}/syft_${SYFT_VERSION}_linux_amd64.tar.gz \
26+
&& tar xvzf syft_${SYFT_VERSION}_linux_amd64.tar.gz syft \
2427
&& mv syft /usr/local/bin \
2528
&& chmod +x /usr/local/bin/syft \
26-
&& rm syft_0.60.3_linux_amd64.tar.gz
29+
&& rm syft_${SYFT_VERSION}_linux_amd64.tar.gz
2730

2831
RUN which cdx \
2932
&& which curl \

scripts/sbom_scraper.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -600,10 +600,10 @@ EOF
600600

601601
if [ "${HTTP_STATUS:0:1}" != "2" ]
602602
then
603-
log "Upload failure ${HTTP_STATUS}"
603+
log "Upload failure ${HTTP_STATUS} :"
604+
cat "${TEMPDIR}/upload"
604605
exit 5
605606
fi
606-
log "Upload success: "
607-
jq . "${TEMPDIR}/upload"
607+
log "Upload success"
608608
fi
609609
exit 0

0 commit comments

Comments
 (0)