diff --git a/Makefile b/Makefile index a7ddb80e..cae77a11 100644 --- a/Makefile +++ b/Makefile @@ -19,11 +19,13 @@ build_stacker = go build $1 -tags "$(BUILD_TAGS) $2" -ldflags "-X main.version=$ # See doc/hacking.md for how to use a local oci or docker repository. STACKER_DOCKER_BASE?=docker://ghcr.io/project-stacker/ # They default to their image name in STACKER_DOCKER_BASE -STACKER_BUILD_BASE_IMAGE?=$(STACKER_DOCKER_BASE)alpine:edge +STACKER_BUILD_BASE_IMAGE?=$(STACKER_BUILD_ALPINE_IMAGE) +STACKER_BUILD_ALPINE_IMAGE?=$(STACKER_DOCKER_BASE)alpine:edge STACKER_BUILD_BUSYBOX_IMAGE?=$(STACKER_DOCKER_BASE)busybox:latest STACKER_BUILD_CENTOS_IMAGE?=$(STACKER_DOCKER_BASE)centos:latest STACKER_BUILD_UBUNTU_IMAGE?=$(STACKER_DOCKER_BASE)ubuntu:latest STACKER_BUILD_IMAGES = \ + $(STACKER_BUILD_ALPINE_IMAGE) \ $(STACKER_BUILD_BASE_IMAGE) \ $(STACKER_BUILD_BUSYBOX_IMAGE) \ $(STACKER_BUILD_CENTOS_IMAGE) \ @@ -149,7 +151,7 @@ test: stacker $(REGCLIENT) $(SKOPEO) $(ZOT) sudo -E PATH="$$PATH" \ LXC_BRANCH=$(LXC_BRANCH) \ LXC_CLONE_URL=$(LXC_CLONE_URL) \ - STACKER_BUILD_BASE_IMAGE=$(STACKER_BUILD_BASE_IMAGE) \ + STACKER_BUILD_ALPINE_IMAGE=$(STACKER_BUILD_ALPINE_IMAGE) \ STACKER_BUILD_BUSYBOX_IMAGE=$(STACKER_BUILD_BUSYBOX_IMAGE) \ STACKER_BUILD_CENTOS_IMAGE=$(STACKER_BUILD_CENTOS_IMAGE) \ STACKER_BUILD_UBUNTU_IMAGE=$(STACKER_BUILD_UBUNTU_IMAGE) \ @@ -166,7 +168,8 @@ test-cov: stacker-cov $(REGCLIENT) $(SKOPEO) $(ZOT) -E GOCOVERDIR="$$GOCOVERDIR" \ LXC_BRANCH=$(LXC_BRANCH) \ LXC_CLONE_URL=$(LXC_CLONE_URL) \ - STACKER_BUILD_BASE_IMAGE=$(STACKER_BUILD_BASE_IMAGE) \ + STACKER_BUILD_ALPINE_IMAGE=$(STACKER_BUILD_ALPINE_IMAGE) \ + STACKER_BUILD_BUSYBOX_IMAGE=$(STACKER_BUILD_BUSYBOX_IMAGE) \ STACKER_BUILD_CENTOS_IMAGE=$(STACKER_BUILD_CENTOS_IMAGE) \ STACKER_BUILD_UBUNTU_IMAGE=$(STACKER_BUILD_UBUNTU_IMAGE) \ ./test/main.py \ diff --git a/test/bom.bats b/test/bom.bats index 534f6990..e00e6134 100644 --- a/test/bom.bats +++ b/test/bom.bats @@ -160,8 +160,8 @@ EOF cat > stacker.yaml <