feat: Homogenize the use of MariadB/Postgis (close #232)

kalisio · Mar 17, 2021 · 7b061ce · 7b061ce
1 parent 3bc3f02
commit 7b061ce
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/docs/guides/advanced-usage.md b/docs/guides/advanced-usage.md
@@ -332,6 +332,10 @@ For each service, you need to declare a variable in the `.env` file which tell t
 Before deploying, do not forget to make the **merged configuration** using the [configure](../reference/cli.md#configure) command.
 :::
 
+## Using placement constraints
+
+For each service defined there's a `$(NAME_OF_SERVICE)_CONSTRAINTS` variable that you can define to specify placement constraints. The content of these variable should follow the [docker service constraints syntax](https://docs.docker.com/engine/reference/commandline/service_create/#specify-service-constraints---constraint). Spaces are not allowed in the variable content, except to specify multiple constraints, in which case space is used as a separator.
+
 ## Using hooks
 
 Sometimes, it may be useful to execute some scripts before or after a service is deployed. This is the purpose of the hooks.

diff --git a/docs/reference/environment.md b/docs/reference/environment.md
@@ -179,11 +179,9 @@ The **MapProxy** service is preconfigured to run [Gunicorn](https://gunicorn.org
 | --- | --- | --- |
 | `MARIADB_IMAGE` | The image to be used. | `mariadb` |
 | `MAPUTNIK_TAG` | The version to be used. | `10.5` |
-| `MARIADB_DATA_PATH` | The path to the data. If not defined, a `mariadb` named volume will be automatically created. | `` |
 | `MARIADB_ROOT_PASSWORD` | The root password. | - |
-| `MARIADB_DBNAME` | The name of a database to be created. | - |
-| `MARIADB_USERNAME` | The name of a user to be created. | - |
-| `MARIADB_PASSWORD` | The password of the user to be created. | - |
+| `MARIADB_VOLUME_PATH` | The path to the data volume. If not defined, a `mariadb_data` named volume will be automatically created. | - |
+| `MARIADB_CONSTRAINTS` | The constraints to apply when deploying the service.| `node.labels.mariadb==true` |
 
 ### MongoDB
 
@@ -239,8 +237,9 @@ The **MapProxy** service is preconfigured to run [Gunicorn](https://gunicorn.org
 | --- | --- | --- |
 | `POSTGIS_IMAGE` | The image to be used. | `postgis/postgis` |
 | `POSTGIS_TAG` | The version to be used. | `13-3.0-alpine` |
-| `POSTGIS_USER` | The POSTGRES user. | `postgres` |
-| `POSTGIS_PASSWORD` | The POSTGRES user's password. | `postgres` |
+| `POSTGIS_ROOT_PASSWORD` | The root password. | - |
+| `POSTGIS_VOLUME_PATH` | The path to the data volume. If not defined, a `postgis_data` named volume will be automatically created. | - |
+| `POSTGIS_CONSTRAINTS` | The constraints to apply when deploying the service.| `node.labels.postgis==true` |
 
 ### Prometheus
 
@@ -360,6 +359,5 @@ The **MapProxy** service is preconfigured to run [Gunicorn](https://gunicorn.org
 | `GFS_WORLD_LOADER_UPPER_LIMIT` | The time limit, in seconds, of the forecast data to be downloaded. | `259200` (3 days) |
 | `GFS_WORLD_DEBUG` | The namespaces to enable debug output. Set it to `krawler*` to enable full debug output. | `` |
 
-## Placement constraints
 
-For each service defined there's a `$(NAME_OF_SERVICE)_CONSTRAINTS` variable that you can define to specify placement constraints. The content of these variable should follow the [docker service constraints syntax](https://docs.docker.com/engine/reference/commandline/service_create/#specify-service-constraints---constraint). Spaces are not allowed in the variable content, except to specify multiple constraints, in which case space is used as a separator.
+