This commit is contained in:
2021-01-31 11:12:38 +00:00
parent 4441e34e43
commit 498b669260

View File

@@ -17,7 +17,7 @@ services:
MYSQL_CHARSET: utf8
MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
volumes:
- ../mysql_django:/var/lib/mysql
- mysql-volume:/var/lib/mysql
etherpadsql:
image: mariadb
environment:
@@ -28,7 +28,7 @@ services:
MYSQL_CHARSET: utf8
MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
volumes:
- ../mysql_etherpad:/var/lib/mysql
- ep-mysql-volume:/var/lib/mysql
etherpad:
image: etherpad/etherpad
environment:
@@ -44,8 +44,8 @@ services:
depends_on:
- etherpadsql
volumes:
- ./etherpad/APIKEY.txt:/opt/etherpad-lite/APIKEY.txt
- ./deployment/mysql.cnf:/etc/mysql/conf.d
- /srv/APIKEY.txt:/opt/etherpad-lite/APIKEY.txt
# - ./deployment/mysql.cnf:/etc/mysql/conf.d
fet2020:
image: docker.triton2.fet.at/fet2020django
environment:
@@ -61,8 +61,9 @@ services:
ports:
- "8001:8080"
volumes:
- ./assets:/app/assets
- ./etherpad:/app/etherpad
- /srv/APIKEY.txt:/app/etherpad/APIKEY.txt
volumes:
ep-mysql-volume:
driver: local
mysql-volume:
driver: local