summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Scheller <igor.scheller@igorshp.de>2018-08-12 19:20:26 +0200
committermsquare <msquare@notrademark.de>2018-08-19 16:44:33 +0200
commitfd709f084e12fca62f212e589cdc7880bf4835ce (patch)
tree4458e0c0ee54b37ef2921d30a0ea5096aef91e71
parent8ed3ed3a77a46997e5afa8915bb9ee77c8caf249 (diff)
Readme: Documented database import and added mail config hint
-rw-r--r--README.md8
-rw-r--r--contrib/docker-compose.yml6
2 files changed, 8 insertions, 6 deletions
diff --git a/README.md b/README.md
index 158fa8c1..cd00d927 100644
--- a/README.md
+++ b/README.md
@@ -95,6 +95,14 @@ docker build -f contrib/Dockerfile . -t engelsystem
docker build -f contrib/nginx/Dockerfile . -t engelsystem-nginx
```
+Import database
+```bash
+docker exec -i db_container mysql -u engelsystem -pengelsystem engelsystem < db/install.sql
+docker exec -i db_container mysql -u engelsystem -pengelsystem engelsystem < db/update.sql
+```
+
+To be able to send mails a relay is needed. Set `SMTPHOST=[mail container]` to configure it.
+
#### deploy.sh
The `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 9048fb49..f960e386 100644
--- a/contrib/docker-compose.yml
+++ b/contrib/docker-compose.yml
@@ -34,12 +34,6 @@ services:
MYSQL_RANDOM_ROOT_PASSWORD: 1
volumes:
- db:/var/lib/mysql
- # used for initial database stuff
- # adminer:
- # image: adminer
- # restart: always
- # ports:
- # - 8080:8080
volumes:
db: {}
static: {}