diff options
| author | Igor Scheller <igor.scheller@igorshp.de> | 2019-10-11 22:56:38 +0200 |
|---|---|---|
| committer | msquare <msquare@notrademark.de> | 2019-10-13 13:16:23 +0200 |
| commit | 7a2427e70296ef652f76fe2e2edc47d2e0f70f5a (patch) | |
| tree | 7e98447e4c7d874ec27e26801771086843f3efc3 | |
| parent | 75f04507aedc6cea020da93fc579351cfb0f4f2c (diff) | |
docker-compose: Set mariadb version and added local dev env to readme
| -rw-r--r-- | README.md | 14 | ||||
| -rw-r--r-- | contrib/docker-compose.yml | 3 |
2 files changed, 16 insertions, 1 deletions
@@ -132,6 +132,20 @@ Import database docker exec -it engelsystem bin/migrate ``` +#### Local development +To use the working directory in the container the docker-compose file has to be changed: +```yaml +[...] + nginx: + volumes: + - ../public/assets:/var/www/public/assets +[...] + engelsystem: + volumes: + - ../:/var/www +[...] +``` + #### Scripts ##### bin/deploy.sh The `bin/deploy.sh` script can be used to deploy the engelsystem. It uses rsync to deploy the application to a server over ssh. diff --git a/contrib/docker-compose.yml b/contrib/docker-compose.yml index 197e2281..4624cce4 100644 --- a/contrib/docker-compose.yml +++ b/contrib/docker-compose.yml @@ -27,12 +27,13 @@ services: depends_on: - database database: - image: mariadb:latest + image: mariadb:10.2 environment: MYSQL_DATABASE: engelsystem MYSQL_USER: engelsystem MYSQL_PASSWORD: engelsystem MYSQL_RANDOM_ROOT_PASSWORD: 1 + MYSQL_INITDB_SKIP_TZINFO: "yes" volumes: - db:/var/lib/mysql networks: |