Skip to content

Commit

Permalink
docs(jsonnet): add missing jsonnet.docker.compose configuration prope…
Browse files Browse the repository at this point in the history
…rties
  • Loading branch information
Toilal committed Feb 23, 2021
1 parent 4c4b3ff commit 5941a46
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 14 deletions.
40 changes: 26 additions & 14 deletions docs/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,26 @@ configuration settings, please check the documentation of related feature.
*ddb.yml*

```yaml
docker:
disabled_services: ['python']
jsonnet:
docker:
compose:
excluded_services: ['python']
```

*ddb.local.yml*
```yaml
docker:
disabled_services: []
jsonnet:
docker:
compose:
excluded_services: []
```

*effective configuration (ddb config)*
```yaml
docker:
disabled_services: []
jsonnet:
docker:
compose:
excluded_services: []
```

As you can see lists are overriden by default too.
Expand Down Expand Up @@ -75,22 +81,28 @@ configuration settings, please check the documentation of related feature.
*ddb.yml*

```yaml
docker:
disabled_services: ['python']
jsonnet:
docker:
compose:
excluded_services: ['python']
```

*ddb.local.yml*
```yaml
docker:
disabled_services:
merge: append_if_missing
value: ['gunicorn']
jsonnet:
docker:
compose:
excluded_services:
merge: append_if_missing
value: ['gunicorn']
```

*effective configuration (ddb config)*
```yaml
docker:
disabled_services: ['python', 'gunicorn']
jsonnet:
docker:
compose:
excluded_services: ['python', 'gunicorn']
```

!!! info "Configuration and environment variables"
Expand Down
10 changes: 10 additions & 0 deletions docs/features/jsonnet.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,16 @@ Run `ddb configure` to evaluate templates and generate target files.
| `virtualhost` | *VirtualHost* | `ddb.VirtualHost()` defaults. |
| `xdebug` | *XDebug* | `ddb.XDebug()` defaults. |

!!! summary "Docker Compose configuration (prefixed with `jsonnet.docker.compose.`)"
=== "Simple"
| Property | Type | Description |
| :---------: | :----: | :----------- |
| `project_name` | string | Docker compose project name |
| `network_name` | string | Docker compose network name |
| `version` | string<br>`3.7` | YAML File version to use |
| `excluded_services` | string[]<br>`[]` | Services to exclude (Block list). |
| `included_services` | string[]<br>`[]` | Services to include (Allow list). |

!!! summary "Docker Networks configuration (prefixed with `jsonnet.docker.networks`)"
=== "Simple"
| Property | Type | Description |
Expand Down

0 comments on commit 5941a46

Please sign in to comment.