Merge commit 'ed2894533d20ceaff1a3d03c676c30bc7e60d50c' into integrat-login-clean-test

CONTRIBUTING.md

@@ -184,6 +184,8 @@ pnpm test:integration help
 
 To run the tests in docker against the latest release of Zitadel, use the following command:
 
+:warning: The acceptance tests are not reliable at the moment :construction:
+
 ```sh
 make login_test_acceptance
 ```

Makefile

@@ -71,7 +71,7 @@ login_test_integration_cleanup:
 login_test_integration: login_test_integration_build
 	$(LOGIN_DIR)scripts/run_or_skip.sh login_test_integration_run \
 	"$(LOGIN_TAG) \
-	$(CORE_MOCK_TAG) \
+	$(LOGIN_CORE_MOCK_TAG) \
 	$(LOGIN_TEST_INTEGRATION_TAG)"
 
 login_test_acceptance_build_bake:

apps/login-test-integration/docker-compose.yaml

@@ -1,6 +1,6 @@
 services:
   core-mock:
-    image: "${CORE_MOCK_TAG:-core-mock:local}"
+    image: "${LOGIN_CORE_MOCK_TAG:-login-core-mock:local}"
     container_name: integration-core-mock
     ports:
       - 22220:22220

docker-bake.hcl

@@ -6,14 +6,6 @@ variable "DOCKERFILES_DIR" {
   default = "dockerfiles/"
 }
 
-variable "UID" {
-  default = "1000"
-}
-
-variable "GID" {
-  default = "1000"
-}
-
 # typescript-proto-client is used to generate the client code for the login service.
 # It is not login-prefixed, so it is easily extendable.
 # To extend this bake-file.hcl, set the context of all login-prefixed targets to a different directory.
@@ -28,8 +20,10 @@ target "typescript-proto-client" {
 }
 
 target "typescript-proto-client-out" {
-  inherits = ["typescript-proto-client"]
-  target = "typescript-proto-client-out"
+  dockerfile = "${DOCKERFILES_DIR}typescript-proto-client-out.Dockerfile"
+  contexts = {
+    typescript-proto-client = "target:typescript-proto-client"
+  }
   output = [
     "type=local,dest=packages/zitadel-proto"
   ]

dockerfiles/login-client.Dockerfile

@@ -1,7 +1,6 @@
 FROM typescript-proto-client AS login-client
 COPY packages/zitadel-tsconfig packages/zitadel-tsconfig
 COPY packages/zitadel-client/package.json ./packages/zitadel-client/
-RUN ls -la
 RUN --mount=type=cache,id=pnpm,target=/pnpm/store \
     pnpm install --frozen-lockfile --workspace-root --filter ./packages/zitadel-client
 COPY packages/zitadel-client ./packages/zitadel-client

dockerfiles/typescript-proto-client-out.Dockerfile

@@ -0,0 +1,5 @@
+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

dockerfiles/typescript-proto-client-out.Dockerfile.dockerignore

@@ -0,0 +1 @@
+*

dockerfiles/typescript-proto-client.Dockerfile

@@ -4,11 +4,3 @@ RUN --mount=type=cache,id=pnpm,target=/pnpm/store \
     pnpm install --frozen-lockfile --workspace-root --filter zitadel-proto
 COPY packages/zitadel-proto ./packages/zitadel-proto
 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
-
-FROM typescript-proto-client

dockerfiles/typescript-proto-client.Dockerfile.dockerignore

@@ -1,2 +1,6 @@
 *
 !/packages/zitadel-proto/
+packages/zitadel-proto/google
+packages/zitadel-proto/zitadel
+packages/zitadel-proto/protoc-gen-openapiv2
+packages/zitadel-proto/validate