From ffc8ee8cf7c8684ca08cfa24a0ac0204a41fc843 Mon Sep 17 00:00:00 2001 From: "root (lxc-fetsite-04)" Date: Sat, 10 Oct 2020 12:04:18 +0200 Subject: [PATCH 1/2] relative path to mysql added --- docker-compose.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index f7375d6f..62c68b3e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,8 +2,6 @@ version: "3" services: flaskfetfotos: image: flask-fet-fotos - ports: - - "8080:8080" environment: FLASK_DEBUG: 1 FLASK_APP: main.py @@ -18,7 +16,7 @@ services: MYSQL_COLLATION: utf8_general_ci MYSQL_CHARSET: utf8 volumes: - - mysql-volume:/var/lib/mysql + - ../mysql_django:/var/lib/mysql etherpadsql: image: jbergstroem/mariadb-alpine environment: @@ -29,7 +27,7 @@ services: MYSQL_COLLATION: utf8_general_ci MYSQL_CHARSET: utf8 volumes: - - ep-mysql-volume:/var/lib/mysql + - ../mysql_etherpad:/var/lib/mysql etherpad: image: etherpad/etherpad environment: @@ -51,4 +49,4 @@ services: - ./fet2020:/app volumes: ep-mysql-volume: - mysql-volume: \ No newline at end of file + mysql-volume: From 147c1ddd0b408e7e57e13bbefd5099ea29a2bdc2 Mon Sep 17 00:00:00 2001 From: "root (lxc-fetsite-04)" Date: Sat, 10 Oct 2020 18:56:32 +0200 Subject: [PATCH 2/2] docker --- docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7b310990..88531d5b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -42,7 +42,8 @@ services: fet2020: image: fet2020django environment: - HOST_NAME: "uat1.2020.fet.at" + HOST_NAME: "2020.fet.at" + DEBUG: "FALSE" depends_on: - mysql ports: