From ae38c80a43f233d94290f496faacaa3d594bdbfb Mon Sep 17 00:00:00 2001
From: Elio Bischof <elio@zitadel.com>
Date: Wed, 18 Jun 2025 12:06:06 +0200
Subject: [PATCH] quality

---
 .github/workflows/test.yml | 2 +-
 Makefile                   | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 87cf830195..633cb306ee 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -36,6 +36,6 @@ jobs:
       - run: make login-quality
         env:
           # latest if branch is main, otherwise image version which is the pull request number
-          BUILDX_CLI: depot
+          BUILDX_CLI: depot --file docker-bake.hcl --file docker-bake-ci.hcl
           DEPOT_PROJECT_ID: jp837jn3fm
           REF_TAG: ${{ github.ref == 'refs/heads/main' && 'latest' || fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
diff --git a/Makefile b/Makefile
index bf395299b3..0ce43bac09 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 XDG_CACHE_HOME ?= $(HOME)/.cache
 export CACHE_DIR ?= $(XDG_CACHE_HOME)/zitadel-make
 
-export BUILDX_CLI ?= docker buildx
+export BAKE_CLI ?= docker buildx
 export REF_TAG ?= local
 export LOGIN_TAG := login:${REF_TAG}
 export LOGIN_TEST_UNIT_TAG := login-test-unit:${REF_TAG}
@@ -56,8 +56,7 @@ login-test-integration: login-standalone-build login-test-integration-build
 	$(LOGIN_TEST_INTEGRATION_TAG)"
 
 login-test-acceptance-build:
-	COMPOSE_BAKE=true docker compose --file ./apps/login-test-acceptance/docker-compose.yaml build
-	$(BUILDX_CLI) bake login-standalone login-test-acceptance
+	$(BUILDX_CLI) --file ./apps/login-test-acceptance/docker-compose.yaml bake setup sink oidcop samlsp samlidp login-standalone login-test-acceptance
 
 login-test-acceptance-run: login-acceptance-cleanup
 	docker compose --file ./apps/login-test-acceptance/docker-compose.yaml run --rm --service-ports acceptance