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

docker-compose.yml

@@ -1,15 +1,10 @@
-version: "3"
+version: "2"
 services:
-  flaskfetfotos:
-    image: flask-fet-fotos
-    environment:
-     FLASK_DEBUG: 1
-     FLASK_APP: main.py
-     pages_root: /app/data
-    volumes:
-      - /mnt/fotos/www:/app/data
   mysql:
-    image: mariadb
+    image: mariadb:10.7
+    container_name: fet_mysql
+    networks:
+     - fetdocker
     environment:
       MYSQL_DATABASE: fet2020db
       MYSQL_USER: user
@@ -18,22 +13,36 @@ services:
       MYSQL_CHARSET: utf8
       MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
     volumes:
-     - ../mysql_django:/var/lib/mysql
+      #- mysql-volume:/var/lib/mysql
-    # - /home/peter_rules/2021_11_09/django/:/docker-entrypoint-initdb.d/
+      - /srv/initdb/mysql:/docker-entrypoint-initdb.d/
+    healthcheck:
+      test: "mysqladmin ping -h localhost &&  echo 'show tables;' | mysql 'fet2020db' >/dev/null "
+      timeout: 20s
+      retries: 20
   etherpadsql:
-    image: mariadb
+    image: mariadb:10.7
+    container_name: fet_mysql_etherpad
+    networks:
+     - fetdocker
     environment:
       MYSQL_DATABASE: etherpaddb
       MYSQL_USER: user
-      MYSQL_PASSWORD: hgu
+      MYSQL_PASSWORD: "hgu"
       MYSQL_COLLATION: utf8_general_ci
       MYSQL_CHARSET: utf8
       MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
+    healthcheck:
+      test: "mysqladmin ping -h localhost &&  echo 'show tables;' | mysql --port 3306 --protocol tcp 'etherpaddb' > /dev/null"
+      timeout: 20s
+      retries: 20
     volumes:
-     - ../mysql_etherpad:/var/lib/mysql
+      #- ep-mysql-volume:/var/lib/mysql
-     # - /home/peter_rules/2021_11_09/etherpad/:/docker-entrypoint-initdb.d/
+      - /srv/initdb/etherpad:/docker-entrypoint-initdb.d/
   etherpad:
-    image: etherpad/etherpad
+    image: etherpad/etherpad:1.8.17
+    container_name: fet_etherpad
+    networks:
+     - fetdocker
     environment:
       DB_TYPE: mysql
       DB_HOST: etherpadsql
@@ -42,35 +51,52 @@ services:
       DB_USER: root
       DB_PASS: ""
       DB_CHARSET: utf8
-      #ADMIN_PASSWORD: "AndiS"
-      #REQUIRE_AUTHENTICATION: "false"
       TRUST_PROXY: "true"
       REQUIRE_SESSION: "true"   
-      #LOGLEVEL: "DEBUG"     
     depends_on:
-      - etherpadsql
+      etherpadsql:
-    ports:
+        condition: "service_healthy"
-     - "9001:9001"
     volumes:
-     #- /srv/APIKEY.txt:/app/etherpad/APIKEY.txt
+      - /srv/APIKEY.txt:/opt/etherpad-lite/APIKEY.txt
+    restart: unless-stopped
+#     - ./deployment/mysql.cnf:/etc/mysql/conf.d
+    healthcheck: 
+      test: "curl --fail localhost:9001 >/dev/null "
+      timeout: 10s
+      interval: 15s
+      retries: 30
   fet2020:
-    image: fet2020django
+    image: docker.fet.at/fet2020django
-    build: .
+    container_name: fet_fet2020
+    networks:
+     - fetdocker
     environment:
-     - HOST_NAME
+      HOST_NAME: "fet.at"
-     - DEBUG
+      DEBUG: "False"
-     - SECRET_KEY
+      SECRET_KEY: "sadfreigjopi4qgjpjrp"
-     - MYSQL_USER
+      MYSQL_USER: "user"
-     - MYSQL_PASSWORD
+      MYSQL_PASSWORD: "hgu"
-     - MYSQL_PORT
+      ETHERPAD_GROUP: "g.snlbqn7S6ksRbom3"
     depends_on:
-    - mysql
+      mysql:
+        condition: service_healthy
+      etherpad:
+        condition: service_healthy
     ports:
-      - "8001:8080" 
+      - "8000:8080"
+    healthcheck: 
+      test: "python3 manage.py check --database default" 
+      timeout: 20s
+      retries: 20
     volumes:
-      #- /srv/APIKEY.txt:/app/etherpad/APIKEY.txt
+      - /srv/APIKEY.txt:/app/etherpad/APIKEY.txt
-      #- ./fet2020/files:/app/files
+      - /srv/files:/app/files
-      
+    restart: unless-stopped
 volumes:
   ep-mysql-volume:
+    driver: local
   mysql-volume:
+    driver: local
+networks:
+  fetdocker:
+    name: fetdocker