From b38a0d69fae5df4f896c479759b92e75172e4d4b Mon Sep 17 00:00:00 2001
From: "root (lxc-fetsite-04)" <admin@fet.at>
Date: Mon, 5 Oct 2020 21:58:24 +0200
Subject: [PATCH] docker file service

---
 Dockerfile               |  3 ++-
 docker-compose.yml       | 19 ++++++++++++++++++-
 fet2020/requirements.txt |  9 ++++-----
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 10a9938f..69786872 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ RUN python -m venv /opt/venv
 ENV PATH="/opt/venv/bin:$PATH"
 
 RUN apk add --no-cache --virtual .build-deps ca-certificates gcc linux-headers \
-    	    musl-dev jpeg-dev zlib-dev libffi-dev mysql  \ 
+    	    musl-dev jpeg-dev zlib-dev libffi-dev mysql mariadb-dev \ 
 	    && pip install --upgrade pip 
 
 COPY ./fet2020/requirements.txt /app/requirements.txt
@@ -15,6 +15,7 @@ RUN pip install -r requirements.txt
 
 FROM tiangolo/uwsgi-nginx:python3.8-alpine
 
+RUN apk add ghostscript-dev
 COPY --from=builder /opt/venv /opt/venv
 
 # Make sure we use the virtualenv:
diff --git a/docker-compose.yml b/docker-compose.yml
index 9f279869..f7375d6f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,27 +11,44 @@ services:
   mysql:
     image: jbergstroem/mariadb-alpine
     environment:
-#      SKIP_INNODB: no
+      SKIP_INNODB: "yes"
       MYSQL_DATABASE: fet2020db
       MYSQL_USER: user
       MYSQL_PASSWORD: hgu
+      MYSQL_COLLATION: utf8_general_ci
+      MYSQL_CHARSET: utf8
+    volumes:
+     - mysql-volume:/var/lib/mysql
   etherpadsql:
     image: jbergstroem/mariadb-alpine
     environment:
+      SKIP_INNODB: "yes"
       MYSQL_DATABASE: etherpaddb
       MYSQL_USER: user
       MYSQL_PASSWORD: hgu
+      MYSQL_COLLATION: utf8_general_ci
+      MYSQL_CHARSET: utf8
+    volumes:
+     - ep-mysql-volume:/var/lib/mysql
   etherpad:
     image: etherpad/etherpad
     environment:
       DB_TYPE: mysql
       DB_HOST: etherpadsql
+      DB_PORT: 3306
       DB_NAME: etherpaddb
       DB_USER: user
       DB_PASS: hgu
+    depends_on:
+      - etherpadsql
   fet2020:
     image: fet2020django
+    depends_on:
+     - mysql
     ports:
       - "8001:8080" 
     volumes:
       - ./fet2020:/app
+volumes:
+  ep-mysql-volume:
+  mysql-volume:
\ No newline at end of file
diff --git a/fet2020/requirements.txt b/fet2020/requirements.txt
index 6b492dd1..457a21e6 100644
--- a/fet2020/requirements.txt
+++ b/fet2020/requirements.txt
@@ -7,12 +7,11 @@ django-taggit==1.3.0
 djangorestframework==3.12.1
 docutils==0.16
 easy-thumbnails==2.7.0
+configparser
 etherpad-lite==0.5
-django-filter
-ldap3
-django-environ
-mysql-python
+#mysql-python
 ldap3==2.8.1
-#mysqlclient==2.0.1
+mysqlclient==2.0.1
 Pillow==7.2.0
 ghostscript==0.6
+