From c029e8adcaf4169d8980236755b206decb620d35 Mon Sep 17 00:00:00 2001
From: andis <andis@fet.at>
Date: Fri, 27 May 2022 21:02:31 +0100
Subject: [PATCH] docker fixes

---
 Dockerfile               |  2 +-
 docker-compose.andis.yml | 53 ----------------------------------------
 docker-compose.dev.yml   |  6 ++---
 docker-compose.yml       | 11 +++++----
 4 files changed, 10 insertions(+), 62 deletions(-)
 delete mode 100644 docker-compose.andis.yml

diff --git a/Dockerfile b/Dockerfile
index d47cc2a3..c425b649 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 mariadb-dev \ 
+    	    musl-dev jpeg-dev zlib-dev libffi-dev mysql mariadb-dev libfreetype6-dev\ 
 	    && pip install --upgrade pip 
 
 COPY ./fet2020/requirements.txt /app/requirements.txt
diff --git a/docker-compose.andis.yml b/docker-compose.andis.yml
deleted file mode 100644
index eaa6cf8f..00000000
--- a/docker-compose.andis.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-version: "2"
-services:
-  flaskfetfotos:
-    image: flask-fet-fotos
-    environment:
-     FLASK_DEBUG: 1
-     FLASK_APP: main.py
-     pages_root: /app/data
-    volumes:
-      - foto-data:/app/data
-  etherpadsql:
-    image: mariadb
-    environment:
-      MYSQL_DATABASE: etherpaddb
-      MYSQL_USER: user
-      MYSQL_PASSWORD: hgu
-      MYSQL_COLLATION: utf8_general_ci
-      MYSQL_CHARSET: utf8
-      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
-    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
-      DB_CHARSET: utf8
-      TRUST_PROXY: "true"
-      REQUIRE_SESSION: "true"  
-    depends_on:
-      - etherpadsql
-    volumes:
-     - ./etherpad/APIKEY.txt:/opt/etherpad-lite/APIKEY.txt
-  theia:
-    image: docker.triton2.fet.at/theia-fet2020:latest
-    volumes:
-      - .:/home/project
-      -  ./etherpad/APIKEY.txt:/srv/etherpad/APIKEY.txt
-  nginx:
-    image: nginx:alpine
-    volumes:
-      - ./deployment/nginxdev.conf:/etc/nginx/conf.d/default.conf
-    ports:
-      - "8106:8080"
-volumes:
-  ep-mysql-volume:
-    driver: local
-  foto-data:
-    driver: local
\ No newline at end of file
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 160e2dd4..45f229e8 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -1,7 +1,7 @@
 version: "2"
 services:
   flaskfetfotos:
-    image: docker.triton2.fet.at/flask-fet-fotos:latest
+    image: docker.fet.at/flask-fet-fotos:latest
     environment:
      FLASK_DEBUG: 0
      FLASK_APP: main.py
@@ -33,13 +33,13 @@ services:
     volumes:
      - /srv/etherpad/APIKEY.txt:/opt/etherpad-lite/APIKEY.txt
   theia:
-    image: docker.triton2.fet.at/theia-fet2020:latest
+    image: docker.fet.at/theia-fet2020:latest
     volumes:
       - dev_data:/home/project
       -  /srv/etherpad/APIKEY.txt:/srv/etherpad/APIKEY.txt
       - theia_usr:/usr/local
     environment:
-      HOST_NAME: andis.triton2.fet.at
+      HOST_NAME: '${HOSTNAME}'
   nginx:
     image: docker.triton2.fet.at/nginxdev-fet2020:latest
     ports:
diff --git a/docker-compose.yml b/docker-compose.yml
index 9ecf9727..e77a9622 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,6 +19,7 @@ services:
       MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
     volumes:
      - ../mysql_django:/var/lib/mysql
+    # - /home/peter_rules/2021_11_09/django/:/docker-entrypoint-initdb.d/
   etherpadsql:
     image: mariadb
     environment:
@@ -30,6 +31,7 @@ services:
       MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
     volumes:
      - ../mysql_etherpad:/var/lib/mysql
+     # - /home/peter_rules/2021_11_09/etherpad/:/docker-entrypoint-initdb.d/
   etherpad:
     image: etherpad/etherpad
     environment:
@@ -50,8 +52,7 @@ services:
     ports:
      - "9001:9001"
     volumes:
-     - ./etherpad/APIKEY.txt:/opt/etherpad-lite/APIKEY.txt
-     - ./deployment/mysql.cnf:/etc/mysql/conf.d
+     #- /srv/APIKEY.txt:/app/etherpad/APIKEY.txt
   fet2020:
     image: fet2020django
     build: .
@@ -67,9 +68,9 @@ services:
     ports:
       - "8001:8080" 
     volumes:
-      - ./fet2020:/app
-      - ./assets:/app/assets
-      - ./etherpad:/app/etherpad
+      #- /srv/APIKEY.txt:/app/etherpad/APIKEY.txt
+      #- ./fet2020/files:/app/files
+      
 volumes:
   ep-mysql-volume:
   mysql-volume: