Move the values from the override to the main file, so we can use the override to disable the login server.

This commit is contained in:
Ivaylo Novakov 2020-12-08 16:31:34 +01:00
parent 9d42dda0a6
commit 53e70c28a3
No known key found for this signature in database
GPG Key ID: 06B9354AB08BE9C6
1 changed files with 22 additions and 3 deletions

View File

@ -185,6 +185,11 @@ services:
- DSN=cockroach://root@cockroachd:26257/defaultdb?sslmode=disable&max_conns=20&max_idle_conns=4 - DSN=cockroach://root@cockroachd:26257/defaultdb?sslmode=disable&max_conns=20&max_idle_conns=4
volumes: volumes:
- ./docker/kratos/config:/etc/config/kratos - ./docker/kratos/config:/etc/config/kratos
-
type: volume
source: kratos-sqlite
target: /var/lib/sqlite
read_only: false
command: -c /etc/config/kratos/kratos.yml migrate sql -e --yes command: -c /etc/config/kratos/kratos.yml migrate sql -e --yes
networks: networks:
shared: shared:
@ -195,6 +200,9 @@ services:
container_name: kratos container_name: kratos
restart: unless-stopped restart: unless-stopped
logging: *default-logging logging: *default-logging
ports:
- "4433:4433" # public
- "4434:4434" # admin
expose: expose:
- 4433 # public - 4433 # public
- 4434 # admin - 4434 # admin
@ -204,6 +212,15 @@ services:
command: serve -c /etc/config/kratos/kratos.yml command: serve -c /etc/config/kratos/kratos.yml
volumes: volumes:
- ./docker/kratos/config:/etc/config/kratos - ./docker/kratos/config:/etc/config/kratos
-
type: volume
source: kratos-sqlite
target: /var/lib/sqlite
read_only: false
-
type: bind
source: ./.kratos.yml
target: /etc/config/kratos/kratos.yml
networks: networks:
shared: shared:
ipv4_address: 10.10.10.81 ipv4_address: 10.10.10.81
@ -213,10 +230,10 @@ services:
kratos-selfservice-ui-node: kratos-selfservice-ui-node:
image: oryd/kratos-selfservice-ui-node:v0.5.0-alpha.1 image: oryd/kratos-selfservice-ui-node:v0.5.0-alpha.1
container_name: kratos-selfservice-ui-node container_name: kratos-selfservice-ui-node
restart: unless-stopped restart: on-failure
logging: *default-logging logging: *default-logging
expose: ports:
- 4455 - "4455:4455"
environment: environment:
- PORT=4455 - PORT=4455
- SECURITY_MODE= - SECURITY_MODE=
@ -232,6 +249,8 @@ services:
image: cockroachdb/cockroach:v20.1.0 image: cockroachdb/cockroach:v20.1.0
container_name: cockroachd container_name: cockroachd
command: start --insecure command: start --insecure
volumes:
- kratos-sqlite:/cockroach/cockroach-data
expose: expose:
- 26257 - 26257
networks: networks: