TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-12 12:57:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'a0d31a6bb2e0cdb570d2eabc2cbd25165ec89e23' into integrate-login

Browse Source
This commit is contained in:
Elio Bischof
2025-06-24 02:09:55 +02:00
parent 253a0b6a0b a0d31a6bb2
commit 5407d4d6c8
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
login/Makefile
View File

@@ -34,6 +34,7 @@ login-help:
@echo "Makefile for the login service" @echo "Makefile for the login service"
@echo "Available targets:" @echo "Available targets:"
@echo " login-help - Show this help message." @echo " login-help - Show this help message."
@echo " login-generate - Generate TypeScript client code from Protobuf definitions."
@echo " login-quality - Run all quality checks (login-lint, login-test-unit, login-test-integration, login-test-acceptance)." @echo " login-quality - Run all quality checks (login-lint, login-test-unit, login-test-integration, login-test-acceptance)."
@echo " login-standalone-build - Build the docker image for production login containers." @echo " login-standalone-build - Build the docker image for production login containers."
@echo " login-lint - Run linting and formatting checks. FORCE=true prevents skipping." @echo " login-lint - Run linting and formatting checks. FORCE=true prevents skipping."
@@ -43,6 +44,7 @@ login-help:
@echo " show-run-caches - Show all run caches with image ids and exit codes." @echo " show-run-caches - Show all run caches with image ids and exit codes."
@echo " clean-run-caches - Remove all run caches." @echo " clean-run-caches - Remove all run caches."
login-lint: login-lint:
$(LOGIN_BAKE_CLI_WITH_COMMON_ARGS) login-lint $(LOGIN_BAKE_CLI_WITH_COMMON_ARGS) login-lint
@@ -109,6 +111,9 @@ login-standalone-build:
login-standalone-build-tag: login-standalone-build-tag:
@echo -n "$(LOGIN_TAG)" @echo -n "$(LOGIN_TAG)"
typescript-generate:
$(LOGIN_BAKE_CLI_WITH_COMMON_ARGS) typescript-proto-client-out
.PHONY: clean-run-caches .PHONY: clean-run-caches
clean-run-caches: clean-run-caches:
@echo "Removing cache directory: $(CACHE_DIR)" @echo "Removing cache directory: $(CACHE_DIR)"
@@ -120,3 +125,4 @@ show-run-caches:
@find "$(CACHE_DIR)" -type f 2>/dev/null | while read file; do \ @find "$(CACHE_DIR)" -type f 2>/dev/null | while read file; do \
echo "$$file: $$(cat $$file)"; \ echo "$$file: $$(cat $$file)"; \
done done

19
login/docker-bake.hcl
View File

@@ -9,11 +9,19 @@ variable "DOCKERFILES_DIR" {
# The zitadel repository uses this to generate the client and the mock server from local proto files. # The zitadel repository uses this to generate the client and the mock server from local proto files.
target "typescript-proto-client" { target "typescript-proto-client" {
dockerfile = "${DOCKERFILES_DIR}typescript-proto-client.Dockerfile" dockerfile = "${DOCKERFILES_DIR}typescript-proto-client.Dockerfile"
target = "typescript-proto-client"
contexts = { contexts = {
# We directly generate and download the client server-side with buf, so we don't need the proto files # We directly generate and download the client server-side with buf, so we don't need the proto files
login-pnpm = "target:login-pnpm" login-pnpm = "target:login-pnpm"
} }
output = ["type=docker"] }
target "typescript-proto-client-out" {
inherits = ["typescript-proto-client"]
target = "typescript-proto-client-out"
output = [
"type=local,dest=packages/zitadel-proto"
]
} }
# proto-files is only used to build login-core-mock against which the integration tests run. # proto-files is only used to build login-core-mock against which the integration tests run.
@@ -62,15 +70,6 @@ target "login-client" {
} }
} }
target "typescript-proto-client" {
dockerfile = "${DOCKERFILES_DIR}typescript-proto-client.Dockerfile"
contexts = {
# We directly generate and download the client server-side with buf, so we don't need the proto files
login-pnpm = "target:login-pnpm"
}
output = ["type=docker"]
}
variable "LOGIN_CORE_MOCK_TAG" { variable "LOGIN_CORE_MOCK_TAG" {
default = "login-core-mock:local" default = "login-core-mock:local"
} }

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

@@ -4,3 +4,9 @@ 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 packages/zitadel-proto packages/zitadel-proto COPY packages/zitadel-proto packages/zitadel-proto
RUN pnpm generate RUN pnpm generate
FROM scratch AS typescript-proto-client-out
COPY --from=typescript-proto-client /build/packages/zitadel-proto/zitadel /zitadel
COPY --from=typescript-proto-client /build/packages/zitadel-proto/google /google
COPY --from=typescript-proto-client /build/packages/zitadel-proto/protoc-gen-openapiv2 /protoc-gen-openapiv2
COPY --from=typescript-proto-client /build/packages/zitadel-proto/validate /validate