update docker compose

docker-compose.yml

@@ -1,79 +1,25 @@
-version: "2"
+name: fet-homepage
+
 services:
-  mysql:
+  nginx:
-    image: mariadb:10.7
+    container_name: nginx-container
-    container_name: fet_mysql
+    image: django-nginx-image:latest
-    networks:
+    ports:
-     - fetdocker
+      - "80:80"
-    environment:
-      MYSQL_DATABASE: fet2020db
-      MYSQL_USER: user
-      MYSQL_PASSWORD: hgu
-      MYSQL_COLLATION: utf8_general_ci
-      MYSQL_CHARSET: utf8
-      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
-    volumes:
-      #- mysql-volume:/var/lib/mysql
-      - /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:10.7
-    container_name: fet_mysql_etherpad
-    networks:
-     - fetdocker
-    environment:
-      MYSQL_DATABASE: etherpaddb
-      MYSQL_USER: user
-      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:
-      #- ep-mysql-volume:/var/lib/mysql
-      - /srv/initdb/etherpad:/docker-entrypoint-initdb.d/
-  etherpad:
-    image: etherpad/etherpad:1.8.17
-    container_name: fet_etherpad
-    networks:
-     - fetdocker
-    environment:
-      DB_TYPE: mysql
-      DB_HOST: etherpadsql
-      DB_PORT: 3306
-      DB_NAME: etherpaddb
-      DB_USER: root
-      DB_PASS: ""
-      DB_CHARSET: utf8
-      TRUST_PROXY: "true"
-      REQUIRE_SESSION: "true"   
     depends_on:
-      etherpadsql:
+      - django-homepage
-        condition: "service_healthy"
     volumes:
-      - /srv/APIKEY.txt:/opt/etherpad-lite/APIKEY.txt
+      - files-volume:/usr/src/app/files
-    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: docker.fet.at/fet2020django
-    container_name: fet_fet2020
     networks:
-     - fetdocker
+      - fet-network
+  django-homepage:
+    container_name: django-container
+    image: django-image:latest
     environment:
       HOST_NAME: "fet.at"
       DEBUG: "False"
-      SECRET_KEY: "sadfreigjopi4qgjpjrp"
+      LDAP: "True"
+      SECRET_KEY: "sae34sADfrFr89E!Gl#f!34hdjGR#!jopi4qFEr#4R56rT56zT2#wE1!feGp"
       MYSQL_USER: "user"
       MYSQL_PASSWORD: "hgu"
       ETHERPAD_GROUP: "g.snlbqn7S6ksRbom3"
@@ -82,21 +28,94 @@ services:
         condition: service_healthy
       etherpad:
         condition: service_healthy
-    ports:
+    volumes:
-      - "8000:8080"
+      - ./fet2020:/usr/src/app
+      - ./gallery:/usr/src/app/files/uploads/gallery:shared
+      - files-volume:/usr/src/app/files
+    networks:
+      - fet-network
+      - django-db-network
+    restart: unless-stopped
     healthcheck: 
       test: "python3 manage.py check --database default" 
       timeout: 20s
       retries: 20
+  etherpad:
+    container_name: etherpad-container
+    image: etherpad/etherpad:1.8.17
+    # ports:
+    #   - 9001:9001
+    environment:
+      DB_TYPE: mysql
+      DB_HOST: etherpadsql
+      DB_PORT: 3306
+      DB_NAME: etherpaddb
+      DB_USER: user
+      DB_PASS: "hgu"
+      DB_CHARSET: utf8
+      TRUST_PROXY: false
+    depends_on:
+      etherpadsql:
+        condition: "service_healthy"
     volumes:
-      - /srv/APIKEY.txt:/app/etherpad/APIKEY.txt
+      - ./fet2020/etherpad/APIKEY.txt:/opt/etherpad-lite/APIKEY.txt
-      - /srv/files:/app/files
+    networks:
+      - fet-network
+      - etherpad-db-network
     restart: unless-stopped
+    healthcheck: 
+      test: "curl --fail localhost:9001 >/dev/null "
+      timeout: 10s
+      interval: 15s
+      retries: 30
+  mysql:
+    container_name: django-db-container
+    image: mariadb:10.7
+    environment:
+      MYSQL_DATABASE: fet2020db
+      MYSQL_USER: user
+      MYSQL_PASSWORD: hgu
+      MYSQL_COLLATION: utf8_general_ci
+      MYSQL_CHARSET: utf8
+      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
+    volumes:
+      - mysql-volume:/docker-entrypoint-initdb.d/
+    networks:
+      - django-db-network
+    healthcheck:
+      test: "mysqladmin ping -h localhost &&  echo 'show tables;' | mysql 'fet2020db' >/dev/null "
+      timeout: 20s
+      retries: 20
+  etherpadsql:
+    container_name: etherpad-db-container
+    image: mariadb:10.7
+    environment:
+      MYSQL_DATABASE: etherpaddb
+      MYSQL_USER: user
+      MYSQL_PASSWORD: "hgu"
+      MYSQL_COLLATION: utf8_general_ci
+      MYSQL_CHARSET: utf8
+      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
+    volumes:
+      - etherpad-mysql-volume:/docker-entrypoint-initdb.d/
+    networks:
+      - etherpad-db-network
+    healthcheck:
+      test: "mysqladmin ping -h localhost &&  echo 'show tables;' | mysql --port 3306 --protocol tcp 'etherpaddb' > /dev/null"
+      timeout: 20s
+      retries: 20
 volumes:
-  ep-mysql-volume:
-    driver: local
   mysql-volume:
     driver: local
+  etherpad-mysql-volume:
+    driver: local
+  files-volume:
+    driver: local
+    name: django-files-volume
 networks:
-  fetdocker:
+  fet-network:
-    name: fetdocker
+    driver: bridge
+  django-db-network:
+    driver: bridge
+  etherpad-db-network:
+    driver: bridge