diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 35d22f08..6507ec9e 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -1,7 +1,7 @@ version: "2" services: flaskfetfotos: - image: docker.triton2.fet.at/flask-fet-fotos + image: docker.fet.at/flask-fet-fotos environment: FLASK_DEBUG: 1 FLASK_APP: main.py @@ -18,6 +18,7 @@ services: MYSQL_ALLOW_EMPTY_PASSWORD: "yes" volumes: - mysql-volume:/var/lib/mysql + #- /root/2022_04_24/mysql:/docker-entrypoint-initdb.d/ etherpadsql: image: mariadb environment: @@ -29,6 +30,7 @@ services: MYSQL_ALLOW_EMPTY_PASSWORD: "yes" volumes: - ep-mysql-volume:/var/lib/mysql +# - /root/2022_04_24/etherpad:/docker-entrypoint-initdb.d/ etherpad: image: etherpad/etherpad environment: @@ -47,7 +49,7 @@ services: - /srv/APIKEY.txt:/opt/etherpad-lite/APIKEY.txt # - ./deployment/mysql.cnf:/etc/mysql/conf.d fet2020: - image: docker.triton2.fet.at/fet2020django + image: docker.fet.at/fet2020django environment: - HOST_NAME - DEBUG @@ -59,9 +61,10 @@ services: - mysql - etherpad ports: - - "8001:8080" + - "8005:8080" volumes: - /srv/APIKEY.txt:/app/etherpad/APIKEY.txt + - files:/app/files volumes: ep-mysql-volume: driver: local