bofh/fet2020
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://git.fet.at/bofh/fet2020

Browse Source
This commit is contained in:
Andreas Stephanides
2020-10-10 17:23:27 +00:00
parent c9bac3cbae 147c1ddd0b
commit 15d2e7cedb
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
docker-compose.yml
View File

@@ -2,8 +2,6 @@ version: "3"
services: services:
flaskfetfotos: flaskfetfotos:
image: flask-fet-fotos image: flask-fet-fotos
ports:
- "8080:8080"
environment: environment:
FLASK_DEBUG: 1 FLASK_DEBUG: 1
FLASK_APP: main.py FLASK_APP: main.py
@@ -18,7 +16,7 @@ services:
MYSQL_COLLATION: utf8_general_ci MYSQL_COLLATION: utf8_general_ci
MYSQL_CHARSET: utf8 MYSQL_CHARSET: utf8
volumes: volumes:
- mysql-volume:/var/lib/mysql - ../mysql_django:/var/lib/mysql
etherpadsql: etherpadsql:
image: jbergstroem/mariadb-alpine image: jbergstroem/mariadb-alpine
environment: environment:
@@ -29,7 +27,7 @@ services:
MYSQL_COLLATION: utf8_general_ci MYSQL_COLLATION: utf8_general_ci
MYSQL_CHARSET: utf8 MYSQL_CHARSET: utf8
volumes: volumes:
- ep-mysql-volume:/var/lib/mysql - ../mysql_etherpad:/var/lib/mysql
etherpad: etherpad:
image: etherpad/etherpad image: etherpad/etherpad
environment: environment:
@@ -44,7 +42,8 @@ services:
fet2020: fet2020:
image: fet2020django image: fet2020django
environment: environment:
HOST_NAME: "uat1.2020.fet.at" HOST_NAME: "2020.fet.at"
DEBUG: "FALSE"
depends_on: depends_on:
- mysql - mysql
ports: ports:
@@ -53,4 +52,4 @@ services:
- ./fet2020:/app - ./fet2020:/app
volumes: volumes:
ep-mysql-volume: ep-mysql-volume:
mysql-volume: mysql-volume: