@@ -6,13 +6,15 @@ ALPINE_IMAGE=$(IMAGE_NAME):alpine-3.6
66BUSYBOX_IMAGE =busybox:1.35
77
88ENVS =./environments
9- DOCKER_RUN =docker run --rm -t -w /project/test/install -v $(shell pwd) /../../:/project
9+ DOCKER_RUN =docker run --rm -t -w /project/test/install -v /var/run/docker.sock:/var/run/docker.sock -v $(shell pwd) /../../:/project
1010UNIT =make unit-local
1111
1212# acceptance testing is running the current install.sh against the latest release. Note: this could be a problem down
1313# the line if there are breaking changes made that don't align with the latest release (but will be OK with the next
1414# release)
15- acceptance =sh -c 'curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b /usr/local/bin && ../../install.sh && docker sbom version'
15+ CURL_INSTALL_SYFT =curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b /usr/local/bin
16+ WGET_INSTALL_SYFT =wget -O - https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b /usr/local/bin
17+ ACCEPTANCE_CMD =../../install.sh && docker sbom version
1618
1719# CI cache busting values; change these if you want CI to not use previous stored cache
1820INSTALL_TEST_CACHE_BUSTER =894d8ca
5557acceptance-ubuntu-20.04 : ubuntu-20.04
5658 $(call title,ubuntu:20.04 - acceptance)
5759 $(DOCKER_RUN ) $(UBUNTU_IMAGE ) \
58- $( acceptance )
60+ sh -c ' $(CURL_INSTALL_SYFT) && $(ACCEPTANCE_CMD) '
5961
6062unit-ubuntu-20.04 : ubuntu-20.04
6163 $(call title,ubuntu:20.04 - unit)
@@ -73,7 +75,7 @@ ubuntu-20.04:
7375acceptance-alpine-3.6 : alpine-3.6
7476 $(call title,alpine:3.6 - acceptance)
7577 $(DOCKER_RUN ) $(ALPINE_IMAGE ) \
76- $( acceptance )
78+ sh -c ' $(WGET_INSTALL_SYFT) && $(ACCEPTANCE_CMD) '
7779
7880alpine-3.6 :
7981 $(call title,alpine:3.6 - build environment)
@@ -88,7 +90,7 @@ alpine-3.6:
8890acceptance-busybox-1.35 : busybox-1.35
8991 $(call title,busybox-1.35 - acceptance)
9092 $(DOCKER_RUN ) $(BUSYBOX_IMAGE ) \
91- $( acceptance )
93+ sh -c ' $(WGET_INSTALL_SYFT) && $(ACCEPTANCE_CMD) '
9294
9395busybox-1.35 :
9496 $(call title,busybox-1.35 - build environment)
0 commit comments