From cd37f8c7b7f5abbf7736810eb2f60d90dec84485 Mon Sep 17 00:00:00 2001 From: Elio Bischof Date: Mon, 23 Jun 2025 16:13:48 +0200 Subject: [PATCH] use local protos --- Makefile | 1 + docker-bake.hcl | 12 ++++++++++++ dockerfiles/proto-files.Dockerfile | 2 ++ dockerfiles/proto-files.Dockerfile.dockerignore | 2 ++ dockerfiles/typescript-proto-client.Dockerfile | 6 ++++++ .../typescript-proto-client.Dockerfile.dockerignore | 2 ++ 6 files changed, 25 insertions(+) create mode 100644 docker-bake.hcl create mode 100644 dockerfiles/proto-files.Dockerfile create mode 100644 dockerfiles/proto-files.Dockerfile.dockerignore create mode 100644 dockerfiles/typescript-proto-client.Dockerfile create mode 100644 dockerfiles/typescript-proto-client.Dockerfile.dockerignore diff --git a/Makefile b/Makefile index 39ec3251d6..2904ae331e 100644 --- a/Makefile +++ b/Makefile @@ -183,4 +183,5 @@ 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 include login/Makefile diff --git a/docker-bake.hcl b/docker-bake.hcl new file mode 100644 index 0000000000..e606bb7ff5 --- /dev/null +++ b/docker-bake.hcl @@ -0,0 +1,12 @@ +include = ["login/docker-bake.hcl"] + +target "proto-files" { + dockerfile = "dockerfiles/proto-files.Dockerfile" +} + +target "typescript-proto-client" { + dockerfile = "dockerfiles/typescript-proto-client.Dockerfile" + contexts = { + proto-files = "target:proto-files" + } +} diff --git a/dockerfiles/proto-files.Dockerfile b/dockerfiles/proto-files.Dockerfile new file mode 100644 index 0000000000..edbf3bc804 --- /dev/null +++ b/dockerfiles/proto-files.Dockerfile @@ -0,0 +1,2 @@ +FROM scratch AS proto-files +COPY ./proto / diff --git a/dockerfiles/proto-files.Dockerfile.dockerignore b/dockerfiles/proto-files.Dockerfile.dockerignore new file mode 100644 index 0000000000..e26cd3c2d6 --- /dev/null +++ b/dockerfiles/proto-files.Dockerfile.dockerignore @@ -0,0 +1,2 @@ +* +!proto diff --git a/dockerfiles/typescript-proto-client.Dockerfile b/dockerfiles/typescript-proto-client.Dockerfile new file mode 100644 index 0000000000..b7275f670f --- /dev/null +++ b/dockerfiles/typescript-proto-client.Dockerfile @@ -0,0 +1,6 @@ +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 diff --git a/dockerfiles/typescript-proto-client.Dockerfile.dockerignore b/dockerfiles/typescript-proto-client.Dockerfile.dockerignore new file mode 100644 index 0000000000..0db4b8402e --- /dev/null +++ b/dockerfiles/typescript-proto-client.Dockerfile.dockerignore @@ -0,0 +1,2 @@ +* +!/packages/zitadel-proto/