@@ -3,7 +3,6 @@ NAME=docker-sbom-cli-plugin
33IMAGE_NAME =$(NAME ) -install.sh-env
44UBUNTU_IMAGE =$(IMAGE_NAME ) :ubuntu-20.04
55ALPINE_IMAGE =$(IMAGE_NAME ) :alpine-3.6
6- BUSYBOX_IMAGE =busybox:1.35
76
87ENVS =./environments
98DOCKER_RUN =docker run --rm -t -w /project/test/install -v /var/run/docker.sock:/var/run/docker.sock -v $(shell pwd) /../../:/project
@@ -30,7 +29,7 @@ test: unit acceptance
3029ci-test-mac : unit-local acceptance-local
3130
3231# note: do not add acceptance-local to this list
33- acceptance : acceptance-ubuntu-20.04 acceptance-alpine-3.6 acceptance-busybox-1.35
32+ acceptance : acceptance-ubuntu-20.04 acceptance-alpine-3.6
3433
3534unit : unit-ubuntu-20.04
3635
@@ -41,16 +40,14 @@ unit-local:
4140acceptance-local :
4241 $(acceptance )
4342
44- save : ubuntu-20.04 alpine-3.6 busybox-1.35
43+ save : ubuntu-20.04 alpine-3.6
4544 @mkdir cache || true
4645 docker image save -o cache/ubuntu-env.tar $(UBUNTU_IMAGE )
4746 docker image save -o cache/alpine-env.tar $(ALPINE_IMAGE )
48- docker image save -o cache/busybox-env.tar $(BUSYBOX_IMAGE )
4947
5048load :
5149 docker image load -i cache/ubuntu-env.tar
5250 docker image load -i cache/alpine-env.tar
53- docker image load -i cache/busybox-env.tar
5451
5552# # UBUNTU #######################################################
5653
@@ -81,20 +78,6 @@ alpine-3.6:
8178 $(call title,alpine:3.6 - build environment)
8279 docker build -t $(ALPINE_IMAGE ) -f $(ENVS ) /Dockerfile-alpine-3.6 .
8380
84- # # BUSYBOX #######################################################
85-
86- # note: unit tests cannot be run with sh (busybox dosn't have bash by default)
87-
88- # note: busybox by default will not have cacerts, so you will get TLS warnings (we want to test under these conditions)
89-
90- acceptance-busybox-1.35 : busybox-1.35
91- $(call title,busybox-1.35 - acceptance)
92- $(DOCKER_RUN ) $(BUSYBOX_IMAGE ) \
93- sh -c ' $(WGET_INSTALL_SYFT) && $(ACCEPTANCE_CMD)'
94-
95- busybox-1.35 :
96- $(call title,busybox-1.35 - build environment)
97- docker pull $(BUSYBOX_IMAGE )
9881
9982# # For CI ########################################################
10083
0 commit comments