From 01b16a28f163b5c26f2cc34b02d65183fa0dc653 Mon Sep 17 00:00:00 2001
From: andis <andis@fet.at>
Date: Sun, 10 Jan 2021 09:09:15 +0000
Subject: [PATCH] improve docker dev

---
 docker-compose.andis.yml | 51 +++++++-------------------------------
 docker-compose.dev.yml   | 53 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 42 deletions(-)
 create mode 100644 docker-compose.dev.yml

diff --git a/docker-compose.andis.yml b/docker-compose.andis.yml
index 5654a8ea..eaa6cf8f 100644
--- a/docker-compose.andis.yml
+++ b/docker-compose.andis.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: "2"
 services:
   flaskfetfotos:
     image: flask-fet-fotos
@@ -7,27 +7,16 @@ services:
      FLASK_APP: main.py
      pages_root: /app/data
     volumes:
-      - /mnt/fotos/www:/app/data
-  mysql:
-    image: jbergstroem/mariadb-alpine
-    environment:
-      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
+      - foto-data:/app/data
   etherpadsql:
-    image: jbergstroem/mariadb-alpine
+    image: mariadb
     environment:
-      SKIP_INNODB: "no"
       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:
@@ -40,38 +29,14 @@ services:
       DB_USER: user
       DB_PASS: hgu
       DB_CHARSET: utf8
-      #ADMIN_PASSWORD: "AndiS"
-      #REQUIRE_AUTHENTICATION: "false"
       TRUST_PROXY: "true"
-      REQUIRE_SESSION: "true"
-      #LOGLEVEL: "DEBUG"     
+      REQUIRE_SESSION: "true"  
     depends_on:
       - etherpadsql
     volumes:
      - ./etherpad/APIKEY.txt:/opt/etherpad-lite/APIKEY.txt
-#    restart: always
-#  fet2020:
-#    image: fet2020django
-#    build: .
-#    environment:
-#      HOST_NAME: andis.2020.fet.at
-#      DEBUG: "False"
-#      SECRET_KEY: arguiq3ebhnjo
-#      MYSQL_USER: user
-#      MYSQL_PASSWORD: hgu
-#      MYSQL_PORT: 3306
-#    depends_on:
-#    - mysql
-#    ports:
-#      - "8106:8080" 
-#    volumes:
-#      - ./fet2020:/app
-#      - ./assets:/app/assets
-#      - ./etherpad:/app/etherpad
-#      - ./deployment/nginx.conf:/etc/nginx/conf.d/fet2020.conf
-#    restart: always
   theia:
-    image: theiaide/theia-python:latest
+    image: docker.triton2.fet.at/theia-fet2020:latest
     volumes:
       - .:/home/project
       -  ./etherpad/APIKEY.txt:/srv/etherpad/APIKEY.txt
@@ -83,4 +48,6 @@ services:
       - "8106:8080"
 volumes:
   ep-mysql-volume:
-  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
new file mode 100644
index 00000000..ce1313a0
--- /dev/null
+++ b/docker-compose.dev.yml
@@ -0,0 +1,53 @@
+version: "2"
+services:
+  flaskfetfotos:
+    image: docker.triton2.fet.at/flask-fet-fotos:latest
+    environment:
+     FLASK_DEBUG: 0
+     FLASK_APP: main.py
+     pages_root: /app/data
+  etherpadsql:
+    image: mariadb
+    environment:
+      MYSQL_DATABASE: etherpaddb
+      MYSQL_USER: user
+      MYSQL_PASSWORD: hgu
+      MYSQL_COLLATION: utf8_general_ci
+      MYSQL_CHARSET: utf8
+    volumes:
+     - ep-mysql-volume-andis:/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:
+     - /srv/etherpad/APIKEY.txt:/opt/etherpad-lite/APIKEY.txt
+  theia:
+    image: docker.triton2.fet.at/theia-fet2020:latest
+    volumes:
+      - /srv/andis_fet2020:/home/project
+      -  /srv/etherpad/APIKEY.txt:/srv/etherpad/APIKEY.txt
+      - theia_usr:/usr/local
+    environment:
+      HOST_NAME: andis.triton2.fet.at
+  nginx:
+    image: docker.triton2.fet.at/nginxdev-fet2020:latest
+    ports:
+      - "8106:8080"
+volumes:
+  ep-mysql-volume-andis:
+    driver: local
+  mysql-volume-andis:
+    driver: local
+  theia_usr:
+    driver: local