From d2f191b7023078d6225e3975033978e298e920d0 Mon Sep 17 00:00:00 2001 From: Elio Bischof Date: Wed, 18 Jun 2025 12:25:10 +0200 Subject: [PATCH] bake cli --- .github/workflows/test.yml | 2 +- Makefile | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9529d09f65..6bfa874b70 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -41,7 +41,7 @@ jobs: - run: make login-quality env: # latest if branch is main, otherwise image version which is the pull request number - BUILDX_CLI: depot --file docker-bake.hcl --file docker-bake-ci.hcl + BUILDX_CLI: depot bake --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'] }} CACHE_DIR: ${{ runner.temp }}/zitadel-make-cache diff --git a/Makefile b/Makefile index 0ce43bac09..98baf2a56b 100644 --- a/Makefile +++ b/Makefile @@ -34,13 +34,13 @@ login-help: @echo " clean-cache-keys - Remove all cache keys." login-lint: - $(BUILDX_CLI) bake login-lint + $(BAKE_CLI) login-lint login-test-unit: - $(BUILDX_CLI) bake login-test-unit + $(BAKE_CLI) login-test-unit login-test-integration-build: - $(BUILDX_CLI) bake core-mock login-test-integration + $(BAKE_CLI) core-mock login-test-integration login-test-integration-run: login-test-integration-cleanup docker compose --file ./apps/login-test-integration/docker-compose.yaml run --rm integration @@ -56,7 +56,7 @@ login-test-integration: login-standalone-build login-test-integration-build $(LOGIN_TEST_INTEGRATION_TAG)" login-test-acceptance-build: - $(BUILDX_CLI) --file ./apps/login-test-acceptance/docker-compose.yaml bake setup sink oidcop samlsp samlidp login-standalone login-test-acceptance + $(BAKE_CLI) --file ./apps/login-test-acceptance/docker-compose.yaml 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 @@ -84,7 +84,7 @@ login-quality: login-lint login-test-unit login-test-integration login-test-acce .PHONY: login-standalone-build login-standalone-build: - $(BUILDX_CLI) bake login-standalone + $(BAKE_CLI) bake login-standalone .PHONY: clean-cache-keys clean-cache-keys: