From 9a21c6085a183e6512e23f022849d1ce7e4b392e Mon Sep 17 00:00:00 2001
From: Elio Bischof <elio@zitadel.com>
Date: Thu, 24 Jul 2025 00:55:42 +0200
Subject: [PATCH] fix debug container

---
 .../login-integration-debug/devcontainer.json        | 12 ++++++++----
 .../login-integration-debug/docker-compose.yml       | 11 ++++++-----
 apps/login/{integration => }/cypress.config.ts       |  4 ++--
 apps/login/integration/tsconfig.json                 |  2 +-
 apps/login/package.json                              |  2 +-
 apps/login/scripts/entrypoint.sh                     |  2 +-
 6 files changed, 19 insertions(+), 14 deletions(-)
 rename apps/login/{integration => }/cypress.config.ts (68%)

diff --git a/.devcontainer/login-integration-debug/devcontainer.json b/.devcontainer/login-integration-debug/devcontainer.json
index 525b04788e..34713acf5f 100644
--- a/.devcontainer/login-integration-debug/devcontainer.json
+++ b/.devcontainer/login-integration-debug/devcontainer.json
@@ -5,10 +5,14 @@
 		"../base/docker-compose.yml",
 		"docker-compose.yml"
 	],
-	"service": "login-integration-debug",
-	"runServices": ["login-integration-debug"],
+	"service": "login-integration",
+	"runServices": [
+		"login-integration"
+	],
 	"workspaceFolder": "/workspaces",
-	"forwardPorts": [3001],
+	"forwardPorts": [
+		3001
+	],
 	"onCreateCommand": "pnpm install --recursive",
 	"postAttachCommand": "pnpm turbo daemon clean; pnpm turbo @zitadel/login#dev test:integration:login:debug",
 	"customizations": {
@@ -18,4 +22,4 @@
 			}
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/.devcontainer/login-integration-debug/docker-compose.yml b/.devcontainer/login-integration-debug/docker-compose.yml
index 11ce02ee7d..23896a8aea 100644
--- a/.devcontainer/login-integration-debug/docker-compose.yml
+++ b/.devcontainer/login-integration-debug/docker-compose.yml
@@ -1,9 +1,10 @@
 services:
-  login-integration-debug:
+  login-integration:
+    container_name: login-integration-debug
     extends:
       file: ../base/docker-compose.yml
       service: devcontainer
-    container_name: login-integration-debug
-    depends_on:
-      mock-zitadel:
-        condition: service_started
+    build:
+      context: ../base
+      dockerfile: !reset ""
+    network_mode: !reset ""
diff --git a/apps/login/integration/cypress.config.ts b/apps/login/cypress.config.ts
similarity index 68%
rename from apps/login/integration/cypress.config.ts
rename to apps/login/cypress.config.ts
index a115cd9d1a..e245c7df1c 100644
--- a/apps/login/integration/cypress.config.ts
+++ b/apps/login/cypress.config.ts
@@ -5,8 +5,8 @@ export default defineConfig({
 
   e2e: {
     baseUrl: process.env.LOGIN_BASE_URL || "http://localhost:3001/ui/v2/login",
-    specPattern: "integration/**/*.cy.{js,jsx,ts,tsx}",
-    supportFile: "support/e2e.{js,jsx,ts,tsx}",
+    specPattern: "integration/integration/**/*.cy.{js,jsx,ts,tsx}",
+    supportFile: "integration/support/e2e.{js,jsx,ts,tsx}",
     setupNodeEvents(on, config) {
       // implement node event listeners here
     },
diff --git a/apps/login/integration/tsconfig.json b/apps/login/integration/tsconfig.json
index 18edb199ac..48c3e14e45 100644
--- a/apps/login/integration/tsconfig.json
+++ b/apps/login/integration/tsconfig.json
@@ -4,5 +4,5 @@
     "lib": ["es5", "dom"],
     "types": ["cypress", "node"]
   },
-  "include": ["**/*.ts"]
+  "include": ["**/*.ts", "../cypress.config.ts"]
 }
diff --git a/apps/login/package.json b/apps/login/package.json
index a4e02922ee..0d084781a2 100644
--- a/apps/login/package.json
+++ b/apps/login/package.json
@@ -97,4 +97,4 @@
     "@playwright/test": "^1.52.0",
     "gaxios": "^7.1.0"
   }
-}
+}
\ No newline at end of file
diff --git a/apps/login/scripts/entrypoint.sh b/apps/login/scripts/entrypoint.sh
index 123612d1cb..f170b2a809 100755
--- a/apps/login/scripts/entrypoint.sh
+++ b/apps/login/scripts/entrypoint.sh
@@ -10,4 +10,4 @@ fi
 
 
 
-exec node /runtime/apps/login/apps/login/server.js
+exec node /runtime/apps/login/server.js