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

fix paths

Browse Source
This commit is contained in:
Elio Bischof
2025-07-23 11:29:21 +02:00
parent 43db63df09
commit f2551a2c5d
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
.devcontainer/base/docker-compose.yml
View File

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