From b5cb6e2ffd45c48155b0e3fe90a9b82ed519db9f Mon Sep 17 00:00:00 2001
From: Elio Bischof <elio@zitadel.com>
Date: Mon, 23 Jun 2025 23:39:06 +0200
Subject: [PATCH] fix context

---
 Makefile                                                    | 3 ++-
 docker-bake.hcl                                             | 4 ++--
 dockerfiles/typescript-proto-client.Dockerfile              | 6 ++++--
 dockerfiles/typescript-proto-client.Dockerfile.dockerignore | 3 ++-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 2904ae331e..85c9ccb8ef 100644
--- a/Makefile
+++ b/Makefile
@@ -183,5 +183,6 @@ login-ensure-remote:
 	@git remote -v | grep $(LOGIN_REMOTE_NAME) || \
 	git remote add $(LOGIN_REMOTE_NAME) $(LOGIN_REMOTE_URL)
 
-LOGIN_BAKE_CLI ?= docker buildx bake --file ./docker-bake.hcl
+export LOGIN_DIR := ./login/
+export LOGIN_BAKE_CLI_ADDITIONAL_ARGS :=  --set login-*.context=./login/ --file ./docker-bake.hcl
 include login/Makefile
diff --git a/docker-bake.hcl b/docker-bake.hcl
index e606bb7ff5..c781d2e9a0 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -1,10 +1,10 @@
-include = ["login/docker-bake.hcl"]
-
 target "proto-files" {
+  context = "./"
   dockerfile = "dockerfiles/proto-files.Dockerfile"
 }
 
 target "typescript-proto-client" {
+  context = "./"
   dockerfile = "dockerfiles/typescript-proto-client.Dockerfile"
   contexts = {
     proto-files = "target:proto-files"
diff --git a/dockerfiles/typescript-proto-client.Dockerfile b/dockerfiles/typescript-proto-client.Dockerfile
index b7275f670f..17eab4ee95 100644
--- a/dockerfiles/typescript-proto-client.Dockerfile
+++ b/dockerfiles/typescript-proto-client.Dockerfile
@@ -2,5 +2,7 @@ FROM login-pnpm AS typescript-proto-client
 COPY ./login/packages/zitadel-proto/package.json ./packages/zitadel-proto/
 RUN --mount=type=cache,id=pnpm,target=/pnpm/store \
     pnpm install --frozen-lockfile --workspace-root --filter zitadel-proto
-COPY --from=proto-files / /proto-files
-RUN cd packages/zitadel-proto && pnpm exec buf generate /proto-files --path ./proto/zitadel
+COPY --from=proto-files / ./packages/zitadel-proto/proto
+COPY ./login/packages/zitadel-proto/buf.gen.yaml ./packages/zitadel-proto/
+RUN ls -la packages/zitadel-proto
+RUN cd packages/zitadel-proto && pnpm exec buf generate . --path ./proto/zitadel
diff --git a/dockerfiles/typescript-proto-client.Dockerfile.dockerignore b/dockerfiles/typescript-proto-client.Dockerfile.dockerignore
index 0db4b8402e..2d7f6be262 100644
--- a/dockerfiles/typescript-proto-client.Dockerfile.dockerignore
+++ b/dockerfiles/typescript-proto-client.Dockerfile.dockerignore
@@ -1,2 +1,3 @@
 *
-!/packages/zitadel-proto/
+!login/packages/zitadel-proto/
+login/packages/zitadel-proto/proto