docker fixes2

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 \ 
+    	    musl-dev jpeg-dev zlib-dev libffi-dev mysql  \ 
 	    && pip install --upgrade pip 
 
 COPY ./fet2020/requirements.txt /app/requirements.txt
@@ -20,7 +20,7 @@ COPY --from=builder /opt/venv /opt/venv
 # Make sure we use the virtualenv:
 ENV PATH="/opt/venv/bin:$PATH"
 
-COPY --chown nginx ./fet2020 /app
+COPY ./fet2020 /app
 COPY ./deployment/nginx.conf /etc/nginx/conf.d/fet2020.conf
 
 #RUN python manage.py makemigrations && python manage.py makemigrations posts members

docker-compose.yml

@@ -15,6 +15,20 @@ services:
       MYSQL_DATABASE: fet2020db
       MYSQL_USER: user
       MYSQL_PASSWORD: hgu
+  etherpadsql:
+    image: jbergstroem/mariadb-alpine
+    environment:
+      MYSQL_DATABASE: etherpaddb
+      MYSQL_USER: user
+      MYSQL_PASSWORD: hgu
+  etherpad:
+    image: etherpad/etherpad
+    environment:
+      DB_TYPE: mysql
+      DB_HOST: etherpadsql
+      DB_NAME: etherpaddb
+      DB_USER: user
+      DB_PASS: hgu
   fet2020:
     image: fet2020django
     ports:

fet2020/requirements.txt

@@ -10,4 +10,4 @@ etherpad-lite==0.5
 django-filter
 ldap3
 django-environ
-mysqlclient
+mysql-python