TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 20:07:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix context

Browse Source
This commit is contained in:
Elio Bischof
2025-06-23 23:39:06 +02:00
parent 8a7ca49947
commit b5cb6e2ffd
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -183,5 +183,6 @@ login-ensure-remote:
@git remote -v | grep $(LOGIN_REMOTE_NAME) || \ @git remote -v | grep $(LOGIN_REMOTE_NAME) || \
git remote add $(LOGIN_REMOTE_NAME) $(LOGIN_REMOTE_URL) 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 include login/Makefile

4
docker-bake.hcl
View File

@@ -1,10 +1,10 @@
include = ["login/docker-bake.hcl"]
target "proto-files" { target "proto-files" {
context = "./"
dockerfile = "dockerfiles/proto-files.Dockerfile" dockerfile = "dockerfiles/proto-files.Dockerfile"
} }
target "typescript-proto-client" { target "typescript-proto-client" {
context = "./"
dockerfile = "dockerfiles/typescript-proto-client.Dockerfile" dockerfile = "dockerfiles/typescript-proto-client.Dockerfile"
contexts = { contexts = {
proto-files = "target:proto-files" proto-files = "target:proto-files"

6
dockerfiles/typescript-proto-client.Dockerfile
View File

@@ -2,5 +2,7 @@ FROM login-pnpm AS typescript-proto-client
COPY ./login/packages/zitadel-proto/package.json ./packages/zitadel-proto/ COPY ./login/packages/zitadel-proto/package.json ./packages/zitadel-proto/
RUN --mount=type=cache,id=pnpm,target=/pnpm/store \ RUN --mount=type=cache,id=pnpm,target=/pnpm/store \
pnpm install --frozen-lockfile --workspace-root --filter zitadel-proto pnpm install --frozen-lockfile --workspace-root --filter zitadel-proto
COPY --from=proto-files / /proto-files COPY --from=proto-files / ./packages/zitadel-proto/proto
RUN cd packages/zitadel-proto && pnpm exec buf generate /proto-files --path ./proto/zitadel 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

3
dockerfiles/typescript-proto-client.Dockerfile.dockerignore
View File

@@ -1,2 +1,3 @@
* *
!/packages/zitadel-proto/ !login/packages/zitadel-proto/
login/packages/zitadel-proto/proto