File tree Expand file tree Collapse file tree 2 files changed +3
-9
lines changed
core/src/main/java/org/svip/generation/osi/docker Expand file tree Collapse file tree 2 files changed +3
-9
lines changed Original file line number Diff line number Diff line change @@ -20,9 +20,6 @@ RUN curl -L $CYCLONEDX_CLI -o tmp/cyclonedx-cli
20
20
FROM alpine/curl AS syft
21
21
RUN curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b /tmp
22
22
23
- FROM alpine/curl AS sbomtool
24
- RUN curl -L https://github.com/microsoft/sbom-tool/releases/latest/download/sbom-tool-linux-x64 -o /tmp/sbom-tool
25
-
26
23
FROM alpine/curl AS osi
27
24
28
25
# PHP Setup
@@ -78,6 +75,7 @@ RUN npm install -g retire bower cdx-bower-bom @cyclonedx/cdxgen@8.6.0
78
75
RUN go install github.com/ozonru/cyclonedx-go/cmd/cyclonedx-go@latest
79
76
RUN go install github.com/mattermost/gobom/cmd/gobom@latest
80
77
RUN dotnet tool install --global covenant
78
+ RUN dotnet tool install --global Microsoft.Sbom.DotNetTool
81
79
RUN cargo install -- cargo-cyclonedx
82
80
RUN composer global config --no-plugins allow-plugins.cyclonedx/cyclonedx-php-composer true
83
81
RUN composer \
@@ -91,13 +89,9 @@ RUN composer \
91
89
COPY --from=jbom --chmod=755 tmp/jbom.jar /usr/local/bin/
92
90
COPY --from=cyclone_dx_cli --chmod=755 tmp/cyclonedx-cli /usr/local/bin/
93
91
COPY --from=syft --chmod=755 tmp/syft /usr/local/bin/
94
- COPY --from=sbomtool --chmod=755 tmp/sbom-tool /usr/local/bin/
95
-
96
- # Verify installation
97
- COPY --chmod=755 scripts/ /usr/local/bin/
98
- RUN . validate.sh
99
92
100
93
# Setup flask api server
94
+ COPY --chmod=755 scripts/ /usr/local/bin/
101
95
WORKDIR /server
102
96
COPY server/ .
103
97
RUN pip install --break-system-packages -r requirements.txt
Original file line number Diff line number Diff line change @@ -85,7 +85,7 @@ function verify_tools(){
85
85
sbom4files -h & > /dev/null && pass " sbom4files" 3 || fail " sbom4files"
86
86
sbom4python -h & > /dev/null && pass " sbom4python" 3 || fail " sbom4python"
87
87
sbom4rust -h & > /dev/null && pass " sbom4rust" 3 || fail " sbom4rust"
88
- sbom-tool --version & > /dev/null && pass " sbom-tool" 3 || fail " sbom-tool"
88
+ sbom-tool --version & > /dev/null && fail " sbom-tool" || pass " sbom-tool" 3 # returns 1 on success
89
89
spdx-sbom-generator -h & > /dev/null && pass " spdx-sbom-generator" 3 || fail " spdx-sbom-generator"
90
90
syft -h & > /dev/null && pass " syft" 3 || fail " syft"
91
91
You can’t perform that action at this time.
0 commit comments