From b400b1b42cf44fccc391a1ca05169bceec74f587 Mon Sep 17 00:00:00 2001
From: Elio Bischof <elio@zitadel.com>
Date: Thu, 31 Jul 2025 03:40:00 +0200
Subject: [PATCH] network_mode=service:mock-zitadel

---
 .devcontainer/base/docker-compose.yaml           | 14 --------------
 .../login-integration-ci/docker-compose.yaml     | 16 +++++-----------
 2 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/.devcontainer/base/docker-compose.yaml b/.devcontainer/base/docker-compose.yaml
index 6c27f756f9..3e14f9b8e6 100644
--- a/.devcontainer/base/docker-compose.yaml
+++ b/.devcontainer/base/docker-compose.yaml
@@ -1,9 +1,3 @@
-x-build-cache: &build-cache
-  cache_from:
-    - type=gha
-  cache_to:
-    - type=gha,mode=max
-
 services:
 
   devcontainer:
@@ -11,7 +5,6 @@ services:
     build:
       context: ../..
       dockerfile: .devcontainer/base/Dockerfile
-      <<: *build-cache
     volumes:
       - ../../:/workspaces:cached
     command: sleep infinity
@@ -63,7 +56,6 @@ services:
     build:
       context: ../../apps/login/acceptance/setup
       dockerfile: ../go-command.Dockerfile
-      <<: *build-cache
     entrypoint: "./setup.sh"
     network_mode: service:devcontainer
     environment:
@@ -100,7 +92,6 @@ services:
       dockerfile: ../go-command.Dockerfile
       args:
         - LOGIN_TEST_ACCEPTANCE_GOLANG_TAG=${LOGIN_TEST_ACCEPTANCE_GOLANG_TAG:-golang:1.24-alpine}
-      <<: *build-cache
     environment:
       PORT: '3333'
     command:
@@ -125,7 +116,6 @@ services:
       dockerfile: ../go-command.Dockerfile
       args:
         - LOGIN_TEST_ACCEPTANCE_GOLANG_TAG=${LOGIN_TEST_ACCEPTANCE_GOLANG_TAG:-golang:1.24-alpine}
-      <<: *build-cache
     network_mode: service:devcontainer
     environment:
       API_URL: 'http://localhost:8080'
@@ -149,7 +139,6 @@ services:
   #      dockerfile: ../../go-command.Dockerfile
   #      args:
   #        - LOGIN_TEST_ACCEPTANCE_GOLANG_TAG=${LOGIN_TEST_ACCEPTANCE_GOLANG_TAG:-golang:1.24-alpine}
-  #      <<: *build-cache
   #    network_mode: service:devcontainer
   #    environment:
   #      API_URL: 'http://localhost:8080'
@@ -171,7 +160,6 @@ services:
       dockerfile: ../go-command.Dockerfile
       args:
         - LOGIN_TEST_ACCEPTANCE_GOLANG_TAG=${LOGIN_TEST_ACCEPTANCE_GOLANG_TAG:-golang:1.24-alpine}
-      <<: *build-cache
     network_mode: service:devcontainer
     environment:
       API_URL: 'http://localhost:8080'
@@ -193,7 +181,6 @@ services:
   #      dockerfile: ../../go-command.Dockerfile
   #      args:
   #        - LOGIN_TEST_ACCEPTANCE_GOLANG_TAG=${LOGIN_TEST_ACCEPTANCE_GOLANG_TAG:-golang:1.24-alpine}
-  #      <<: *build-cache
   #    network_mode: service:devcontainer
   #    environment:
   #      API_URL: 'http://localhost:8080'
@@ -210,4 +197,3 @@ services:
 
 volumes:
   postgres-data:
-  home-dir:
diff --git a/.devcontainer/login-integration-ci/docker-compose.yaml b/.devcontainer/login-integration-ci/docker-compose.yaml
index 90dddab39d..37c3af946e 100644
--- a/.devcontainer/login-integration-ci/docker-compose.yaml
+++ b/.devcontainer/login-integration-ci/docker-compose.yaml
@@ -3,8 +3,9 @@ services:
     container_name: devcontainer-login-integration
     env_file: ../../apps/login/.env.test
     environment:
-      CORE_MOCK_STUBS_URL: http://mock-zitadel:22220/v1/stubs
-      LOGIN_BASE_URL: http://login-integration:3001/ui/v2/login
+      CORE_MOCK_STUBS_URL: http://localhost:22220/v1/stubs
+      LOGIN_BASE_URL: http://localhost:3001/ui/v2/login
+    network_mode: service:mock-zitadel
     depends_on:
       login-integration:
         condition: service_healthy
@@ -17,11 +18,8 @@ services:
       NODE_ENV: test
       PORT: 3001
       NEXT_PUBLIC_BASE_PATH: /ui/v2/login
-      ZITADEL_API_URL: http://mock-zitadel:22222
-      CUSTOM_REQUEST_HEADERS: Host:localhost
-    depends_on:
-      mock-zitadel:
-        condition: service_started
+      ZITADEL_API_URL: http://localhost:22222
+    network_mode: service:mock-zitadel
 
   mock-zitadel:
     container_name: mock-zitadel
@@ -29,7 +27,3 @@ services:
       context: ../../apps/login/integration/core-mock
       additional_contexts:
         - zitadel-protos=../../proto
-      cache_from:
-        - type=gha
-      cache_to:
-        - type=gha,mode=max