vrr/cozystack
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build(linstor): use shared BUILDX_ARGS for linstor-gui image build

Browse source 
The per-package Makefile added in #2382 hardcoded buildx flags
(--provenance, --builder, --platform=linux/amd64,linux/arm64,
--push, --load, --label) instead of using the shared $(BUILDX_ARGS)
macro from hack/common-envs.mk.

This broke CI: the runner's default docker driver does not support
multi-platform builds, and the hardcoded multi-arch platform list
crashed `make build` with "Multi-platform build is not supported for
the docker driver."

Replace the hardcoded flags with $(BUILDX_ARGS) to match every other
package (e.g. linstor, dashboard, cilium). $(BUILDX_ARGS) injects
--push, --load, --label, --provenance=false, and only sets --builder
or --platform when the operator explicitly exports BUILDER/PLATFORM.

Assisted-By: Claude <noreply@anthropic.com>
Signed-off-by: Myasnikov Daniil <myasnikovdaniil2001@gmail.com>
This commit is contained in:
Myasnikov Daniil 2026-04-27 17:31:07 +05:00
parent 7443e22345
commit a9a66bf066
No known key found for this signature in database
GPG key ID: FA953A439C637F04
1 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
packages/system/linstor-gui/Makefile
View file

@ -12,18 +12,13 @@ image: image-linstor-gui
image-linstor-gui:
docker buildx build images/linstor-gui \
--provenance false \
--builder=$(BUILDER) \
--platform=linux/amd64,linux/arm64 \
--build-arg LINSTOR_GUI_VERSION=$(LINSTOR_GUI_VERSION) \
--tag $(REGISTRY)/linstor-gui:$(call settag,$(LINSTOR_GUI_VERSION)) \
--tag $(REGISTRY)/linstor-gui:$(call settag,$(LINSTOR_GUI_VERSION)-$(TAG)) \
--cache-from type=registry,ref=$(REGISTRY)/linstor-gui:latest \
--cache-to type=inline \
--metadata-file images/linstor-gui.json \
--push=$(PUSH) \
--label "org.opencontainers.image.source=https://github.com/cozystack/cozystack" \
--load=$(LOAD)
$(BUILDX_ARGS)
REPOSITORY="$(REGISTRY)/linstor-gui" \
yq -i '.image.repository = strenv(REPOSITORY)' values.yaml
TAG="$(call settag,$(LINSTOR_GUI_VERSION))@$$(yq e '."containerimage.digest"' images/linstor-gui.json -o json -r)" \