docker fixes

This commit is contained in:
2022-05-27 21:02:31 +01:00
parent 1606af2e78
commit c029e8adca
4 changed files with 10 additions and 62 deletions

View File

@@ -19,6 +19,7 @@ services:
MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
volumes:
- ../mysql_django:/var/lib/mysql
# - /home/peter_rules/2021_11_09/django/:/docker-entrypoint-initdb.d/
etherpadsql:
image: mariadb
environment:
@@ -30,6 +31,7 @@ services:
MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
volumes:
- ../mysql_etherpad:/var/lib/mysql
# - /home/peter_rules/2021_11_09/etherpad/:/docker-entrypoint-initdb.d/
etherpad:
image: etherpad/etherpad
environment:
@@ -50,8 +52,7 @@ services:
ports:
- "9001:9001"
volumes:
- ./etherpad/APIKEY.txt:/opt/etherpad-lite/APIKEY.txt
- ./deployment/mysql.cnf:/etc/mysql/conf.d
#- /srv/APIKEY.txt:/app/etherpad/APIKEY.txt
fet2020:
image: fet2020django
build: .
@@ -67,9 +68,9 @@ services:
ports:
- "8001:8080"
volumes:
- ./fet2020:/app
- ./assets:/app/assets
- ./etherpad:/app/etherpad
#- /srv/APIKEY.txt:/app/etherpad/APIKEY.txt
#- ./fet2020/files:/app/files
volumes:
ep-mysql-volume:
mysql-volume: