Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

integrate kratos v1.0.0 #408

Merged
merged 1 commit into from
Aug 14, 2023
Merged

integrate kratos v1.0.0 #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ services:
- POSTGRES_USER=postgres
- POSTGRES_PASSWORD=postgres
- POSTGRES_MULTIPLE_DATABASES=kratos,keto,kavach
healthcheck:
healthcheck:
interval: 10s
retries: 10
test: "pg_isready -U \"$$POSTGRES_USER\" -d \"kavach\""
timeout: 2s
test: 'pg_isready -U "$$POSTGRES_USER" -d "kavach"'
timeout: 2s
networks:
- kavach

Expand Down Expand Up @@ -98,7 +98,7 @@ services:
###########################################################################
mailslurper:
image: oryd/mailslurper:latest-smtps
ports:
ports:
- "4436:4436"
- "4437:4437"
networks:
Expand All @@ -111,7 +111,7 @@ services:
depends_on:
postgres:
condition: service_healthy
image: oryd/kratos:v0.11.1
image: oryd/kratos:v1.0.0
environment:
- DSN=postgres://postgres:postgres@postgres:5432/kratos?sslmode=disable
volumes:
Expand All @@ -126,7 +126,7 @@ services:
kratos:
depends_on:
- kratos-migrate
image: oryd/kratos:v0.11.1
image: oryd/kratos:v1.0.0
ports:
- "4433:4433" # public
- "4434:4434" # admin
Expand All @@ -149,9 +149,9 @@ services:
depends_on:
postgres:
condition: service_healthy
volumes:
volumes:
- type: bind
source: ./keto
source: ./keto
target: /etc/config/keto
# command: namespace migrate legacy -c "/etc/config/keto/keto.yml" --yes
command: migrate up -c "/etc/config/keto/keto.yml" --yes
Expand All @@ -165,15 +165,15 @@ services:
image: oryd/keto:v0.9.0-alpha.0
ports:
- "4466:4466" # read
- "4467:4467" # write
- "4467:4467" # write
- "4468:4468" # metric
environment:
- LOG_LEVEL=debug
volumes:
- type: bind
source: ./keto
target: /etc/config/keto
command: serve -c "/etc/config/keto/keto.yml"
command: serve -c "/etc/config/keto/keto.yml"
networks:
- kavach

Expand Down Expand Up @@ -226,7 +226,7 @@ services:
# - WAIT_HOSTS=postgres:5432, kratos:4434 , keto:4466
volumes:
- ./server:/app
- ./config/config.env:/app/config.env
- ./config/config.env:/app/config.env
networks:
- kavach

Expand Down Expand Up @@ -276,6 +276,6 @@ services:
restart: unless-stopped
networks:
- kavach

networks:
kavach:
12 changes: 4 additions & 8 deletions kratos/config/kratos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v0.11.1
version: v1.0.0

dsn: postgres://postgres:postgres@postgres:5432/kratos?sslmode=disable

Expand Down Expand Up @@ -74,24 +74,23 @@ selfservice:
password:
hooks:
- hook: require_verified_address

verification:
use: code
enabled: true
ui_url: http://127.0.0.1:4455/.factly/kavach/web/auth/verification

notify_unknown_recipients: true

registration:
after:
default_browser_return_url: http://127.0.0.1:4455/.factly/kavach/web/verification
lifespan: 10m
ui_url: http://127.0.0.1:4455/.factly/kavach/web/auth/registration


recovery:
enabled: true
ui_url: http://127.0.0.1:4455/.factly/kavach/web/auth/recovery

notify_unknown_recipients: true

log:
level: debug
Expand All @@ -115,6 +114,3 @@ identity:
courier:
smtp:
connection_uri: smtps://test:test@mailslurper:1025/?skip_ssl_verify=true