Skip to content

Commit a9a66bf

Browse files
myasnikovdaniilmyasnikovdaniil
committed
build(linstor): use shared BUILDX_ARGS for linstor-gui image build
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 <[email protected]> Signed-off-by: Myasnikov Daniil <[email protected]>
1 parent 7443e22 commit a9a66bf

1 file changed

Lines changed: 1 addition & 6 deletions

File tree

‎packages/system/linstor-gui/Makefile‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,13 @@ image: image-linstor-gui
1212

1313
image-linstor-gui:
1414
docker buildx build images/linstor-gui \
15-
--provenance false \
16-
--builder=$(BUILDER) \
17-
--platform=linux/amd64,linux/arm64 \
1815
--build-arg LINSTOR_GUI_VERSION=$(LINSTOR_GUI_VERSION) \
1916
--tag $(REGISTRY)/linstor-gui:$(call settag,$(LINSTOR_GUI_VERSION)) \
2017
--tag $(REGISTRY)/linstor-gui:$(call settag,$(LINSTOR_GUI_VERSION)-$(TAG)) \
2118
--cache-from type=registry,ref=$(REGISTRY)/linstor-gui:latest \
2219
--cache-to type=inline \
2320
--metadata-file images/linstor-gui.json \
24-
--push=$(PUSH) \
25-
--label "org.opencontainers.image.source=https://github.com/cozystack/cozystack" \
26-
--load=$(LOAD)
21+
$(BUILDX_ARGS)
2722
REPOSITORY="$(REGISTRY)/linstor-gui" \
2823
yq -i '.image.repository = strenv(REPOSITORY)' values.yaml
2924
TAG="$(call settag,$(LINSTOR_GUI_VERSION))@$$(yq e '."containerimage.digest"' images/linstor-gui.json -o json -r)" \

0 commit comments

Comments
 (0)