From 0255a9c5038da1f5f46c4a7b97aea35e86f34942 Mon Sep 17 00:00:00 2001 From: Evan Baker Date: Wed, 30 Aug 2023 15:54:48 -0500 Subject: [PATCH] fix: add OS=windows to manifest-add args (#2194) due to a change in buildx, we need to explicitly pull the windows variant of the windows image that we have previously built. Signed-off-by: Evan Baker --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index dbcdbaccf0..8de1d98a41 100644 --- a/Makefile +++ b/Makefile @@ -478,14 +478,14 @@ manifest-create: $(CONTAINER_BUILDER) manifest create $(IMAGE_REGISTRY)/$(IMAGE):$(TAG) manifest-add: - $(CONTAINER_BUILDER) manifest add --os-version=$($(OS_VERSION)) $(IMAGE_REGISTRY)/$(IMAGE):$(TAG) docker://$(IMAGE_REGISTRY)/$(IMAGE):$(subst /,-,$(PLATFORM))$(if $(OS_VERSION),-$(OS_VERSION),)-$(TAG) + $(CONTAINER_BUILDER) manifest add --os=$(OS) --os-version=$($(OS_VERSION)) $(IMAGE_REGISTRY)/$(IMAGE):$(TAG) docker://$(IMAGE_REGISTRY)/$(IMAGE):$(subst /,-,$(PLATFORM))$(if $(OS_VERSION),-$(OS_VERSION),)-$(TAG) manifest-build: # util target to compose multiarch container manifests from platform specific images. $(MAKE) manifest-create $(foreach PLATFORM,$(PLATFORMS),\ $(if $(filter $(PLATFORM),windows/amd64),\ $(foreach OS_VERSION,$(OS_VERSIONS),\ - $(MAKE) manifest-add OS_VERSION=$(OS_VERSION) PLATFORM=$(PLATFORM);\ + $(MAKE) manifest-add CONTAINER_BUILDER=$(CONTAINER_BUILDER) OS=windows OS_VERSION=$(OS_VERSION) PLATFORM=$(PLATFORM);\ ),\ $(MAKE) manifest-add PLATFORM=$(PLATFORM);\ )\