oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2026-11-01 15:06:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: ensure java image build failures stop the build (#4531)

Browse Source 
---------
Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
This commit is contained in:
Alex Goodman
2026-01-06 11:43:51 -05:00
committed by GitHub
parent 3ea6a03cd0
commit ed339e4fed
10 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
syft/file/cataloger/executable/test-fixtures/Makefile
+2 -2
View File
@@ -3,13 +3,13 @@
default:
@for dir in $(shell find . -mindepth 1 -maxdepth 1 -type d); do \
if [ -f "$$dir/Makefile" ]; then \
$(MAKE) -C $$dir; \
$(MAKE) -C $$dir || exit 1; \
fi; \
done
%:
@for dir in $(shell find . -mindepth 1 -maxdepth 1 -type d); do \
if [ -f "$$dir/Makefile" ]; then \
$(MAKE) -C $$dir $@; \
$(MAKE) -C $$dir $@ || exit 1; \
fi; \
done
syft/pkg/cataloger/golang/test-fixtures/Makefile
+2 -2
View File
@@ -3,13 +3,13 @@
default:
@for dir in $(shell find . -mindepth 1 -maxdepth 1 -type d); do \
if [ -f "$$dir/Makefile" ]; then \
$(MAKE) -C $$dir; \
$(MAKE) -C $$dir || exit 1; \
fi; \
done
%:
@for dir in $(shell find . -mindepth 1 -maxdepth 1 -type d); do \
if [ -f "$$dir/Makefile" ]; then \
$(MAKE) -C $$dir $@; \
$(MAKE) -C $$dir $@ || exit 1; \
fi; \
done
syft/pkg/cataloger/java/test-fixtures/Makefile
+2 -2
View File
@@ -3,13 +3,13 @@
default:
@for dir in $(shell find . -mindepth 1 -maxdepth 1 -type d); do \
if [ -f "$$dir/Makefile" ]; then \
$(MAKE) -C $$dir; \
$(MAKE) -C $$dir || exit 1; \
fi; \
done
%:
@for dir in $(shell find . -mindepth 1 -maxdepth 1 -type d); do \
if [ -f "$$dir/Makefile" ]; then \
$(MAKE) -C $$dir $@; \
$(MAKE) -C $$dir $@ || exit 1; \
fi; \
done
syft/pkg/cataloger/java/test-fixtures/java-builds/build-example-java-app-gradle.sh
-1
View File
@@ -11,7 +11,6 @@ function cleanup() {
}
trap cleanup EXIT
set +e
docker cp "$(pwd)/example-java-app" "${CTRID}:/"
docker start -a "${CTRID}"
syft/pkg/cataloger/java/test-fixtures/java-builds/build-example-java-app-maven.sh
-1
View File
@@ -11,7 +11,6 @@ function cleanup() {
}
trap cleanup EXIT
set +e
docker cp "$(pwd)/example-java-app" "${CTRID}:/"
docker start -a "${CTRID}"
syft/pkg/cataloger/java/test-fixtures/java-builds/build-example-java-app-native-image.sh
+2 -4
View File
@@ -3,16 +3,14 @@ set -uxe
PKGSDIR=$1
CTRID=$(docker create -v /example-java-app ghcr.io/graalvm/native-image:22.2.0 -cp /example-java-app/example-java-app-maven-0.1.0.jar -XX:-UseContainerSupport --no-fallback -H:Class=hello.HelloWorld -H:Name=example-java-app)
CTRID=$(docker create -v /example-java-app ghcr.io/graalvm/native-image:22.2.0 -J-XX:-UseContainerSupport -cp /example-java-app/example-java-app-maven-0.1.0.jar --no-fallback -H:Class=hello.HelloWorld -H:Name=example-java-app)
function cleanup() {
docker rm "${CTRID}"
}
trap cleanup EXIT
set +e
docker cp "${PKGSDIR}/example-java-app-maven-0.1.0.jar" "${CTRID}:/example-java-app/"
docker start -a "${CTRID}"
docker cp "${CTRID}:/app/example-java-app" $PKGSDIR
docker cp "${CTRID}:/app/example-java-app" "$PKGSDIR"
syft/pkg/cataloger/java/test-fixtures/java-builds/build-example-jenkins-plugin.sh
-1
View File
@@ -11,7 +11,6 @@ function cleanup() {
}
trap cleanup EXIT
set +e
docker cp "$(pwd)/example-jenkins-plugin" "${CTRID}:/"
docker start -a "${CTRID}"
syft/pkg/cataloger/java/test-fixtures/java-builds/build-example-sb-app-nestedjar.sh
-1
View File
@@ -11,7 +11,6 @@ function cleanup() {
}
trap cleanup EXIT
set +e
docker cp "$(pwd)/example-sb-app" "${CTRID}:/"
docker start -a "${CTRID}"