CommunEu
/
Passbolt
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'modernNeo-patch-1' into develop

This commit is contained in:
Diego Lendoiro 2018-10-23 09:46:25 +02:00
parent 6eb5ee5c17 29f6005448
commit f217edac79
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
README.md
View File

@ -37,10 +37,10 @@ docker image with the default passbolt credentials.
```bash ```bash
$ docker run -e MYSQL_ROOT_PASSWORD=<root_password> \ $ docker run -e MYSQL_ROOT_PASSWORD=<root_password> \
-e MYSQL_DATABASE=<mysql_database> \ -e MYSQL_DATABASE=<mariadb_database> \
-e MYSQL_USER=<mysql_user> \ -e MYSQL_USER=<mariadb_user> \
-e MYSQL_PASSWORD=<mysql_password> \ -e MYSQL_PASSWORD=<mariadb_password> \
mysql mariadb
``` ```
Then you can start passbolt just by providing the database container ip in the Then you can start passbolt just by providing the database container ip in the
@ -48,10 +48,12 @@ Then you can start passbolt just by providing the database container ip in the
```bash ```bash
$ docker run --name passbolt \ $ docker run --name passbolt \
-e DATASOURCES_DEFAULT_HOST=<mysql_container_host> \ -p 80:80 \
-e DATASOURCES_DEFAULT_PASSWORD=<mysql_password> \ -p 443:443 \
-e DATASOURCES_DEFAULT_USERNAME=<mysql_user> \ -e DATASOURCES_DEFAULT_HOST=<mariadb_container_host> \
-e DATASOURCES_DEFAULT_DATABASE=<mysql_database> \ -e DATASOURCES_DEFAULT_PASSWORD=<mariadb_password> \
-e DATASOURCES_DEFAULT_USERNAME=<mariadb_user> \
-e DATASOURCES_DEFAULT_DATABASE=<mariadb_database> \
-e APP_FULL_BASE_URL=https://mydomain.com \ -e APP_FULL_BASE_URL=https://mydomain.com \
passbolt/passbolt:develop-debian passbolt/passbolt:develop-debian
``` ```
@ -155,4 +157,4 @@ $ docker-compose up
* rng-tools or haveged are required on host machine to speed up entropy generation on containers. * rng-tools or haveged are required on host machine to speed up entropy generation on containers.
This way gpg key creation on passbolt container will be faster. This way gpg key creation on passbolt container will be faster.
* mysql >= 5.6 * mariadb/mysql >= 5.6