Merge branch 'master' into develop #126
38
README.md
38
README.md
@@ -179,27 +179,27 @@ services:
|
|||||||
# this will use the database secrets and environment,
|
# this will use the database secrets and environment,
|
||||||
# see the "database" service to see the values
|
# see the "database" service to see the values
|
||||||
katenary.v3/values-from: |-
|
katenary.v3/values-from: |-
|
||||||
DB_USER: databse.MARIADB_USER
|
DB_USER: database.MARIADB_USER
|
||||||
DB_PASSWORD: database.MARIADB_PASSWORD
|
DB_PASSWORD: database.MARIADB_PASSWORD
|
||||||
|
|
||||||
database:
|
database:
|
||||||
image: mariadb:10
|
image: mariadb:10
|
||||||
env_file:
|
env_file:
|
||||||
# this valuse will be added in a configMap
|
# this valuse will be added in a configMap
|
||||||
- my_env.env
|
- my_env.env
|
||||||
environment:
|
environment:
|
||||||
MARIADB_USER: foo
|
MARIADB_USER: foo
|
||||||
MARIADB_ROOT_PASSWORD: foobar
|
MARIADB_ROOT_PASSWORD: foobar
|
||||||
MARIADB_PASSWORD: bar
|
MARIADB_PASSWORD: bar
|
||||||
labels:
|
labels:
|
||||||
# no need to declare this port in docker-compose
|
# no need to declare this port in docker-compose
|
||||||
# but katenary will need it
|
# but katenary will need it
|
||||||
katenary.v3/ports: |-
|
katenary.v3/ports: |-
|
||||||
- 3306
|
- 3306
|
||||||
# these variables are secrets
|
# these variables are secrets
|
||||||
katenary.v3/secrets: |-
|
katenary.v3/secrets: |-
|
||||||
- MARIADB_ROOT_PASSWORD
|
- MARIADB_ROOT_PASSWORD
|
||||||
- MARIADB_PASSWORD
|
- MARIADB_PASSWORD
|
||||||
```
|
```
|
||||||
|
|
||||||
## Labels
|
## Labels
|
||||||
|
Reference in New Issue
Block a user