TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 15:17:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

network_mode=service:mock-zitadel

Browse Source
This commit is contained in:
Elio Bischof
2025-07-31 03:40:00 +02:00
parent 8678aefd03
commit b400b1b42c
2 changed files with 5 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.devcontainer/base/docker-compose.yaml
View File

@@ -1,9 +1,3 @@
x-build-cache: &build-cache
cache_from:
- type=gha
cache_to:
- type=gha,mode=max
services: services:
devcontainer: devcontainer:
@@ -11,7 +5,6 @@ services:
build: build:
context: ../.. context: ../..
dockerfile: .devcontainer/base/Dockerfile dockerfile: .devcontainer/base/Dockerfile
<<: *build-cache
volumes: volumes:
- ../../:/workspaces:cached - ../../:/workspaces:cached
command: sleep infinity command: sleep infinity
@@ -63,7 +56,6 @@ services:
build: build:
context: ../../apps/login/acceptance/setup context: ../../apps/login/acceptance/setup
dockerfile: ../go-command.Dockerfile dockerfile: ../go-command.Dockerfile
<<: *build-cache
entrypoint: "./setup.sh" entrypoint: "./setup.sh"
network_mode: service:devcontainer network_mode: service:devcontainer
environment: environment:
@@ -100,7 +92,6 @@ services:
dockerfile: ../go-command.Dockerfile dockerfile: ../go-command.Dockerfile
args: args:
- LOGIN_TEST_ACCEPTANCE_GOLANG_TAG=${LOGIN_TEST_ACCEPTANCE_GOLANG_TAG:-golang:1.24-alpine} - LOGIN_TEST_ACCEPTANCE_GOLANG_TAG=${LOGIN_TEST_ACCEPTANCE_GOLANG_TAG:-golang:1.24-alpine}
<<: *build-cache
environment: environment:
PORT: '3333' PORT: '3333'
command: command:
@@ -125,7 +116,6 @@ services:
dockerfile: ../go-command.Dockerfile dockerfile: ../go-command.Dockerfile
args: args:
- LOGIN_TEST_ACCEPTANCE_GOLANG_TAG=${LOGIN_TEST_ACCEPTANCE_GOLANG_TAG:-golang:1.24-alpine} - LOGIN_TEST_ACCEPTANCE_GOLANG_TAG=${LOGIN_TEST_ACCEPTANCE_GOLANG_TAG:-golang:1.24-alpine}
<<: *build-cache
network_mode: service:devcontainer network_mode: service:devcontainer
environment: environment:
API_URL: 'http://localhost:8080' API_URL: 'http://localhost:8080'
@@ -149,7 +139,6 @@ services:
# dockerfile: ../../go-command.Dockerfile # dockerfile: ../../go-command.Dockerfile
# args: # args:
# - LOGIN_TEST_ACCEPTANCE_GOLANG_TAG=${LOGIN_TEST_ACCEPTANCE_GOLANG_TAG:-golang:1.24-alpine} # - LOGIN_TEST_ACCEPTANCE_GOLANG_TAG=${LOGIN_TEST_ACCEPTANCE_GOLANG_TAG:-golang:1.24-alpine}
# <<: *build-cache
# network_mode: service:devcontainer # network_mode: service:devcontainer
# environment: # environment:
# API_URL: 'http://localhost:8080' # API_URL: 'http://localhost:8080'
@@ -171,7 +160,6 @@ services:
dockerfile: ../go-command.Dockerfile dockerfile: ../go-command.Dockerfile
args: args:
- LOGIN_TEST_ACCEPTANCE_GOLANG_TAG=${LOGIN_TEST_ACCEPTANCE_GOLANG_TAG:-golang:1.24-alpine} - LOGIN_TEST_ACCEPTANCE_GOLANG_TAG=${LOGIN_TEST_ACCEPTANCE_GOLANG_TAG:-golang:1.24-alpine}
<<: *build-cache
network_mode: service:devcontainer network_mode: service:devcontainer
environment: environment:
API_URL: 'http://localhost:8080' API_URL: 'http://localhost:8080'
@@ -193,7 +181,6 @@ services:
# dockerfile: ../../go-command.Dockerfile # dockerfile: ../../go-command.Dockerfile
# args: # args:
# - LOGIN_TEST_ACCEPTANCE_GOLANG_TAG=${LOGIN_TEST_ACCEPTANCE_GOLANG_TAG:-golang:1.24-alpine} # - LOGIN_TEST_ACCEPTANCE_GOLANG_TAG=${LOGIN_TEST_ACCEPTANCE_GOLANG_TAG:-golang:1.24-alpine}
# <<: *build-cache
# network_mode: service:devcontainer # network_mode: service:devcontainer
# environment: # environment:
# API_URL: 'http://localhost:8080' # API_URL: 'http://localhost:8080'
@@ -210,4 +197,3 @@ services:
volumes: volumes:
postgres-data: postgres-data:
home-dir:

16
.devcontainer/login-integration-ci/docker-compose.yaml
View File

@@ -3,8 +3,9 @@ services:
container_name: devcontainer-login-integration container_name: devcontainer-login-integration
env_file: ../../apps/login/.env.test env_file: ../../apps/login/.env.test
environment: environment:
CORE_MOCK_STUBS_URL: http://mock-zitadel:22220/v1/stubs CORE_MOCK_STUBS_URL: http://localhost:22220/v1/stubs
LOGIN_BASE_URL: http://login-integration:3001/ui/v2/login LOGIN_BASE_URL: http://localhost:3001/ui/v2/login
network_mode: service:mock-zitadel
depends_on: depends_on:
login-integration: login-integration:
condition: service_healthy condition: service_healthy
@@ -17,11 +18,8 @@ services:
NODE_ENV: test NODE_ENV: test
PORT: 3001 PORT: 3001
NEXT_PUBLIC_BASE_PATH: /ui/v2/login NEXT_PUBLIC_BASE_PATH: /ui/v2/login
ZITADEL_API_URL: http://mock-zitadel:22222 ZITADEL_API_URL: http://localhost:22222
CUSTOM_REQUEST_HEADERS: Host:localhost network_mode: service:mock-zitadel
depends_on:
mock-zitadel:
condition: service_started
mock-zitadel: mock-zitadel:
container_name: mock-zitadel container_name: mock-zitadel
@@ -29,7 +27,3 @@ services:
context: ../../apps/login/integration/core-mock context: ../../apps/login/integration/core-mock
additional_contexts: additional_contexts:
- zitadel-protos=../../proto - zitadel-protos=../../proto
cache_from:
- type=gha
cache_to:
- type=gha,mode=max