From f2551a2c5dd9f826a0bf0ee626172043555bfc30 Mon Sep 17 00:00:00 2001
From: Elio Bischof <elio@zitadel.com>
Date: Wed, 23 Jul 2025 11:29:21 +0200
Subject: [PATCH] fix paths

---
 .devcontainer/base/docker-compose.yml | 28 +++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/.devcontainer/base/docker-compose.yml b/.devcontainer/base/docker-compose.yml
index 009c4ca593..c88439a6bb 100644
--- a/.devcontainer/base/docker-compose.yml
+++ b/.devcontainer/base/docker-compose.yml
@@ -35,7 +35,7 @@ services:
   mock-zitadel:
     container_name: mock-zitadel
     build:
-      context: ../../apps/login/packages/integration/core-mock
+      context: ../../apps/login/integration/core-mock
     ports:
       - 22220:22220
       - 22222:22222
@@ -46,7 +46,7 @@ services:
       context: ../..
       dockerfile: dockerfiles/login.Dockerfile
     image: "${LOGIN_TAG:-zitadel-login:local}"
-    env_file: ../../apps/login/apps/login/.env.test
+    env_file: ../../apps/login/.env.test
     network_mode: service:devcontainer
     environment:
       NODE_ENV: test
@@ -60,8 +60,8 @@ services:
     container_name: zitadel
     command: 'start-from-init --masterkey "MasterkeyNeedsToHave32Characters" --config /zitadel.yaml --steps /zitadel.yaml'
     volumes:
-      - ../../apps/login/packages/acceptance/pat:/pat:delegated
-      - ../../apps/login/packages/acceptance/zitadel.yaml:/zitadel.yaml:cached
+      - ../../apps/login/acceptance/pat:/pat:delegated
+      - ../../apps/login/acceptance/zitadel.yaml:/zitadel.yaml:cached
     network_mode: service:devcontainer
     healthcheck:
       test:
@@ -78,7 +78,7 @@ services:
     container_name: configure-login
     restart: no
     build:
-      context: ../../apps/login/packages/acceptance/setup
+      context: ../../apps/login/acceptance/setup
       dockerfile: ../go-command.Dockerfile
     entrypoint: "./setup.sh"
     network_mode: service:devcontainer
@@ -93,8 +93,8 @@ services:
       ZITADEL_API_DOMAIN: localhost
       ZITADEL_ADMIN_USER: zitadel-admin@zitadel.localhost
     volumes:
-      - ../../apps/login/packages/acceptance/pat:/pat:cached # Read the PAT file from zitadels setup
-      - ../../apps/login/apps/login:/login-env:delegated # Write the environment variables file for the login
+      - ../../apps/login/acceptance/pat:/pat:cached # Read the PAT file from zitadels setup
+      - ../../apps/login:/login-env:delegated # Write the environment variables file for the login
     depends_on:
       zitadel:
         condition: "service_healthy"
@@ -104,7 +104,7 @@ services:
     image: "${LOGIN_TAG:-ghcr.io/zitadel/zitadel-login:v4.0.0-rc.2}"
     network_mode: service:devcontainer
     volumes:
-      - ../../apps/login/apps/login/.env.test.local:/env-files/.env:cached
+      - ../../apps/login/.env.test.local:/env-files/.env:cached
     depends_on:
       configure-login:
         condition: service_completed_successfully
@@ -112,7 +112,7 @@ services:
   mock-notifications:
     container_name: mock-notifications
     build:
-      context: ../../apps/login/packages/acceptance/sink
+      context: ../../apps/login/acceptance/sink
       dockerfile: ../go-command.Dockerfile
       args:
         - LOGIN_TEST_ACCEPTANCE_GOLANG_TAG=${LOGIN_TEST_ACCEPTANCE_GOLANG_TAG:-golang:1.24-alpine}
@@ -136,7 +136,7 @@ services:
   mock-oidcrp:
     container_name: mock-oidcrp
     build:
-      context: ../../apps/login/packages/acceptance/oidcrp
+      context: ../../apps/login/acceptance/oidcrp
       dockerfile: ../go-command.Dockerfile
       args:
         - LOGIN_TEST_ACCEPTANCE_GOLANG_TAG=${LOGIN_TEST_ACCEPTANCE_GOLANG_TAG:-golang:1.24-alpine}
@@ -151,7 +151,7 @@ services:
       PORT: '8000'
       SCOPES: 'openid profile email'
     volumes:
-      - ../../apps/login/packages/acceptance/pat:/pat:cached
+      - ../../apps/login/acceptance/pat:/pat:cached
     depends_on:
       configure-login:
         condition: "service_completed_successfully"
@@ -159,7 +159,7 @@ services:
 #  mock-oidcop:
 #    container_name: mock-oidcop
 #    build:
-#      context: ../../apps/login/packages/acceptance/idp/oidc
+#      context: ../../apps/login/acceptance/idp/oidc
 #      dockerfile: ../../go-command.Dockerfile
 #      args:
 #        - LOGIN_TEST_ACCEPTANCE_GOLANG_TAG=${LOGIN_TEST_ACCEPTANCE_GOLANG_TAG:-golang:1.24-alpine}
@@ -180,7 +180,7 @@ services:
   mock-samlsp:
     container_name: mock-samlsp
     build:
-      context: ../../apps/login/packages/acceptance/samlsp
+      context: ../../apps/login/acceptance/samlsp
       dockerfile: ../go-command.Dockerfile
       args:
         - LOGIN_TEST_ACCEPTANCE_GOLANG_TAG=${LOGIN_TEST_ACCEPTANCE_GOLANG_TAG:-golang:1.24-alpine}
@@ -202,7 +202,7 @@ services:
 #  mock-samlidp:
 #    container_name: mock-samlidp
 #    build:
-#      context: ../../apps/login/packages/acceptance/idp/saml
+#      context: ../../apps/login/acceptance/idp/saml
 #      dockerfile: ../../go-command.Dockerfile
 #      args:
 #        - LOGIN_TEST_ACCEPTANCE_GOLANG_TAG=${LOGIN_TEST_ACCEPTANCE_GOLANG_TAG:-golang:1.24-alpine}