From b2333dc6eb6039f027907acc60bbd055fb10fdc2 Mon Sep 17 00:00:00 2001 From: Rich Braun Date: Tue, 1 Sep 2026 22:24:51 -0700 Subject: [PATCH 1/3] SYS-701 more docker buildx headaches --- .image-gitlab-ci.yml | 1 - lib/build/Makefile.docker_image | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.image-gitlab-ci.yml b/.image-gitlab-ci.yml index 07716aee..15932fb1 100644 --- a/.image-gitlab-ci.yml +++ b/.image-gitlab-ci.yml @@ -1,5 +1,4 @@ variables: - DOCKER_CLI_EXPERIMENTAL: enabled DOCKER_TLS_CERTDIR: "" IMAGE: {{ IMAGE }} PLATFORMS: linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7 diff --git a/lib/build/Makefile.docker_image b/lib/build/Makefile.docker_image index a4f3870e..9e202e07 100644 --- a/lib/build/Makefile.docker_image +++ b/lib/build/Makefile.docker_image @@ -53,7 +53,8 @@ test_functional: @echo "Running functional verification of running image" create_image: $(HOME)/.docker/cli-plugins/docker-buildx - docker buildx build --tag $(REGISTRY)/$(IMAGE):$(TAG) --platform $(PLATFORMS) \ + docker buildx build --tag $(REGISTRY)/$(IMAGE):$(TAG) + --platform $(PLATFORMS) --provenance=false --sboms=false \ $(PUSH) --file Dockerfile . \ --build-arg=VCS_REF=$(CI_COMMIT_SHA) \ --build-arg=BUILD_DATE=$(shell date +%Y-%m-%dT%H:%M:%SZ) @@ -64,6 +65,7 @@ promote_image: $(HOME)/.docker/cli-plugins/docker-buildx echo $(GHCR_PUBLISH) | docker login -u $(USER_LOGIN) --password-stdin ghcr.io TAG=$$(hooks/add_tags) && \ docker buildx build $(TAG_OPT) --platform $(PLATFORMS) \ + --provenance=false --sboms=false \ --tag $(IMAGE_REPO):latest \ --tag ghcr.io/$(IMAGE_REPO):latest \ --tag $(IMAGE_REPO):$$TAG \ From 4938e3b52b89d306b3bd928139689fcbb7abf611 Mon Sep 17 00:00:00 2001 From: Rich Braun Date: Tue, 1 Sep 2026 22:28:15 -0700 Subject: [PATCH 2/3] SYS-701 wip --- lib/build/Makefile.docker_image | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/build/Makefile.docker_image b/lib/build/Makefile.docker_image index 9e202e07..0e2f91bb 100644 --- a/lib/build/Makefile.docker_image +++ b/lib/build/Makefile.docker_image @@ -53,7 +53,7 @@ test_functional: @echo "Running functional verification of running image" create_image: $(HOME)/.docker/cli-plugins/docker-buildx - docker buildx build --tag $(REGISTRY)/$(IMAGE):$(TAG) + docker buildx build --tag $(REGISTRY)/$(IMAGE):$(TAG) \ --platform $(PLATFORMS) --provenance=false --sboms=false \ $(PUSH) --file Dockerfile . \ --build-arg=VCS_REF=$(CI_COMMIT_SHA) \ From 2158ba59c0bb94fd1984b758fef33f165b17f7b1 Mon Sep 17 00:00:00 2001 From: Rich Braun Date: Tue, 1 Sep 2026 22:34:49 -0700 Subject: [PATCH 3/3] SYS-701 wip --- lib/build/Makefile.docker_image | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/build/Makefile.docker_image b/lib/build/Makefile.docker_image index 0e2f91bb..c7cf53d0 100644 --- a/lib/build/Makefile.docker_image +++ b/lib/build/Makefile.docker_image @@ -54,7 +54,7 @@ test_functional: create_image: $(HOME)/.docker/cli-plugins/docker-buildx docker buildx build --tag $(REGISTRY)/$(IMAGE):$(TAG) \ - --platform $(PLATFORMS) --provenance=false --sboms=false \ + --platform $(PLATFORMS) --provenance=false --sbom=false \ $(PUSH) --file Dockerfile . \ --build-arg=VCS_REF=$(CI_COMMIT_SHA) \ --build-arg=BUILD_DATE=$(shell date +%Y-%m-%dT%H:%M:%SZ) @@ -65,7 +65,7 @@ promote_image: $(HOME)/.docker/cli-plugins/docker-buildx echo $(GHCR_PUBLISH) | docker login -u $(USER_LOGIN) --password-stdin ghcr.io TAG=$$(hooks/add_tags) && \ docker buildx build $(TAG_OPT) --platform $(PLATFORMS) \ - --provenance=false --sboms=false \ + --provenance=false --sbom=false \ --tag $(IMAGE_REPO):latest \ --tag ghcr.io/$(IMAGE_REPO):latest \ --tag $(IMAGE_REPO):$$TAG \