oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2026-02-12 02:26:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: update busybox image for acceptance tests (#2663)

Browse Source 
Signed-off-by: Keith Zantow <kzantow@gmail.com>
This commit is contained in:
Keith Zantow 2024-02-22 15:32:17 -05:00 committed by GitHub
parent cdf1e0bacb
commit 108a5dae9b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/install/Makefile
View File

@ -3,7 +3,7 @@ NAME=syft
IMAGE_NAME=$(NAME)-install.sh-env IMAGE_NAME=$(NAME)-install.sh-env
UBUNTU_IMAGE=$(IMAGE_NAME):ubuntu-20.04 UBUNTU_IMAGE=$(IMAGE_NAME):ubuntu-20.04
ALPINE_IMAGE=$(IMAGE_NAME):alpine-3.6 ALPINE_IMAGE=$(IMAGE_NAME):alpine-3.6
BUSYBOX_IMAGE=busybox:1.35 BUSYBOX_IMAGE=busybox:1.36.1-musl
ENVS=./environments ENVS=./environments
DOCKER_RUN=docker run --rm -t -w /project/test/install -v $(shell pwd)/../../:/project DOCKER_RUN=docker run --rm -t -w /project/test/install -v $(shell pwd)/../../:/project
@ -32,7 +32,7 @@ ci-test-mac: unit-local acceptance-local
# note: do not add acceptance-local to this list # note: do not add acceptance-local to this list
.PHONY: acceptance .PHONY: acceptance
acceptance: acceptance-ubuntu-20.04 acceptance-alpine-3.6 acceptance-busybox-1.35 acceptance: acceptance-ubuntu-20.04 acceptance-alpine-3.6 acceptance-busybox
.PHONY: unit .PHONY: unit
unit: unit-ubuntu-20.04 unit: unit-ubuntu-20.04
@ -55,7 +55,7 @@ acceptance-previous-release-local:
syft version | grep $(shell echo $(PREVIOUS_RELEASE)| tr -d "v") syft version | grep $(shell echo $(PREVIOUS_RELEASE)| tr -d "v")
.PHONY: save .PHONY: save
save: ubuntu-20.04 alpine-3.6 busybox-1.35 save: ubuntu-20.04 alpine-3.6 pull-busybox
@mkdir cache || true @mkdir cache || true
docker image save -o cache/ubuntu-env.tar $(UBUNTU_IMAGE) docker image save -o cache/ubuntu-env.tar $(UBUNTU_IMAGE)
docker image save -o cache/alpine-env.tar $(ALPINE_IMAGE) docker image save -o cache/alpine-env.tar $(ALPINE_IMAGE)
@ -107,16 +107,16 @@ alpine-3.6:
# note: busybox by default will not have cacerts, so you will get TLS warnings (we want to test under these conditions) # note: busybox by default will not have cacerts, so you will get TLS warnings (we want to test under these conditions)
.PHONY: acceptance-busybox-1.35 .PHONY: acceptance-busybox
acceptance-busybox-1.35: busybox-1.35 acceptance-busybox: pull-busybox
$(call title,busybox-1.35 - acceptance) $(call title,busybox - acceptance)
$(DOCKER_RUN) $(BUSYBOX_IMAGE) \ $(DOCKER_RUN) $(BUSYBOX_IMAGE) \
$(ACCEPTANCE_CMD) $(ACCEPTANCE_CMD)
@echo "\n*** test note: you should see syft spit out a 'x509: certificate signed by unknown authority' error --this is expected ***" @echo "\n*** test note: you should see syft spit out a 'x509: certificate signed by unknown authority' error --this is expected ***"
.PHONY: busybox-1.35 .PHONY: pull-busybox
busybox-1.35: pull-busybox:
$(call title,busybox-1.35 - build environment) $(call title,busybox - build environment)
docker pull $(BUSYBOX_IMAGE) docker pull $(BUSYBOX_IMAGE)
## For CI ######################################################## ## For CI ########################################################