From 1cb277d36d0c283ede5f168a04a20896bb36f191 Mon Sep 17 00:00:00 2001
From: Elio Bischof <elio@zitadel.com>
Date: Wed, 23 Jul 2025 19:09:52 +0200
Subject: [PATCH] fix paths

---
 .devcontainer/base/docker-compose.yml    | 46 ++++++++++++------------
 docker-bake.hcl                          |  2 +-
 e2e/config/localhost/docker-compose.yaml | 14 ++++----
 3 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/.devcontainer/base/docker-compose.yml b/.devcontainer/base/docker-compose.yml
index c88439a6bb..d1b26f1a7b 100644
--- a/.devcontainer/base/docker-compose.yml
+++ b/.devcontainer/base/docker-compose.yml
@@ -24,7 +24,7 @@ services:
       PGUSER: postgres
       POSTGRES_PASSWORD: postgres
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: [ "CMD-SHELL", "pg_isready" ]
       interval: "10s"
       timeout: "30s"
       retries: 5
@@ -42,9 +42,9 @@ services:
 
   login-integration:
     container_name: login-integration
-    build: 
+    build:
       context: ../..
-      dockerfile: dockerfiles/login.Dockerfile
+      dockerfile: build/login/Dockerfile
     image: "${LOGIN_TAG:-zitadel-login:local}"
     env_file: ../../apps/login/.env.test
     network_mode: service:devcontainer
@@ -156,26 +156,26 @@ services:
       configure-login:
         condition: "service_completed_successfully"
 
-#  mock-oidcop:
-#    container_name: mock-oidcop
-#    build:
-#      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}
-#    network_mode: service:devcontainer
-#    environment:
-#      API_URL: 'http://localhost:8080'
-#      API_DOMAIN: 'localhost'
-#      PAT_FILE: '/pat/zitadel-admin-sa.pat'
-#      SCHEMA: 'http'
-#      HOST: 'localhost'
-#      PORT: "8004"
-#    volumes:
-#      - "../apps/login/packages/acceptance/pat:/pat:cached"
-#    depends_on:
-#      configure-login:
-#        condition: "service_completed_successfully"
+  #  mock-oidcop:
+  #    container_name: mock-oidcop
+  #    build:
+  #      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}
+  #    network_mode: service:devcontainer
+  #    environment:
+  #      API_URL: 'http://localhost:8080'
+  #      API_DOMAIN: 'localhost'
+  #      PAT_FILE: '/pat/zitadel-admin-sa.pat'
+  #      SCHEMA: 'http'
+  #      HOST: 'localhost'
+  #      PORT: "8004"
+  #    volumes:
+  #      - "../apps/login/packages/acceptance/pat:/pat:cached"
+  #    depends_on:
+  #      configure-login:
+  #        condition: "service_completed_successfully"
 
   mock-samlsp:
     container_name: mock-samlsp
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 533a07b479..2c36c66141 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -1,6 +1,6 @@
 # login-standalone should be extended by the login-standalone target in apps/login/docker-bake.hcl
 target "login-standalone" {
-  dockerfile = "dockerfiles/login.Dockerfile"
+  dockerfile = "build/login/Dockerfile"
 }
 
 target "login-standalone-out" {
diff --git a/e2e/config/localhost/docker-compose.yaml b/e2e/config/localhost/docker-compose.yaml
index 41334d92f9..cb055dd27c 100644
--- a/e2e/config/localhost/docker-compose.yaml
+++ b/e2e/config/localhost/docker-compose.yaml
@@ -5,12 +5,12 @@ services:
     image: '${ZITADEL_IMAGE:-ghcr.io/zitadel/zitadel:latest}'
     build:
       context: ../../..
-      dockerfile: ./build/Dockerfile
+      dockerfile: ./build/zitadel/Dockerfile
       target: artifact
       cache_from:
-      - type=gha
+        - type=gha
       cache_to:
-      - type=gha,mode=max
+        - type=gha,mode=max
     command: 'start-from-init --masterkey "MasterkeyNeedsToHave32Characters" --tlsMode disabled --config /zitadel.yaml --steps /zitadel.yaml'
     depends_on:
       db:
@@ -18,15 +18,15 @@ services:
     volumes:
       - ./zitadel.yaml:/zitadel.yaml
     ports:
-    - "8080:8080"
+      - "8080:8080"
     healthcheck:
-      test: ["CMD", "/app/zitadel", "ready", "--config", "/zitadel.yaml" ]
+      test: [ "CMD", "/app/zitadel", "ready", "--config", "/zitadel.yaml" ]
       interval: '10s'
       timeout: '5s'
       retries: 5
       start_period: '10s'
     extra_hosts:
-    - "host.docker.internal:host-gateway"
+      - "host.docker.internal:host-gateway"
 
   db:
     restart: 'always'
@@ -35,7 +35,7 @@ services:
       - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=postgres
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready", "-d", "zitadel", "-U", "postgres"]
+      test: [ "CMD-SHELL", "pg_isready", "-d", "zitadel", "-U", "postgres" ]
       interval: '10s'
       timeout: '30s'
       retries: 5