docker-compose-mysql.yml

@@ -1,90 +0,0 @@
-version: '3.9'
-
-volumes:
-  app:
-  mysql:
-
-services:
-  nginx:
-    container_name: reftest_server
-    image: nginx:alpine
-    volumes:
-      - ./certbot:/etc/letsencrypt:ro
-      - ./nginx:/etc/nginx
-      - ./src/html/certbot:/usr/share/nginx/html/certbot:ro
-      - ./src/html/robots.txt:/usr/share/nginx/html/robots.txt:ro
-      - ./ref-test/app/root:/usr/share/nginx/html/root:ro
-      - ./ref-test/app/admin/static:/usr/share/nginx/html/admin/static:ro
-      - ./ref-test/app/editor/static:/usr/share/nginx/html/editor/static:ro
-      - ./ref-test/app/quiz/static:/usr/share/nginx/html/quiz/static:ro
-      - ./ref-test/app/view/static:/usr/share/nginx/html/view/static:ro
-    ports:
-      - 80:80
-      - 443:443
-    restart: unless-stopped
-    networks:
-      - frontend
-    depends_on:
-      app:
-    command: "/bin/sh -c 'while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g \"daemon off;\"'"
-  
-  app:
-    container_name: reftest_app
-    image: reftest
-    build: ./ref-test
-    env_file:
-      - ./.env
-    ports:
-      - 5000
-    volumes:
-      - app:/ref-test/data
-      - ./logs:/ref-test/data/logs
-    restart: unless-stopped
-    networks:
-      - frontend
-      - backend
-    depends_on:
-      postfix:
-      mysql:
-        condition: service_healthy
-
-  postfix:
-    container_name: reftest_postfix
-    image: catatnight/postfix:latest
-    restart: unless-stopped
-    env_file:
-      - ./.env
-    ports:
-      - 25
-    networks:
-      - backend
-  
-  certbot:
-    container_name: reftest_certbot
-    image: certbot/certbot
-    volumes:
-      - ./certbot:/etc/letsencrypt
-      - ./src/html/certbot:/var/www/html
-    entrypoint: "/bin/sh -c 'trap exit TERM; while :; do certbot renew; sleep 12h & wait $${!}; done;'"
-  
-  mysql:
-    container_name: reftest_db
-    image: mysql:8.0
-    env_file:
-      - ./.env
-    volumes:
-      - mysql:/var/lib/mysql
-    ports:
-      - 3306
-    networks:
-      - backend
-    healthcheck:
-      test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
-      timeout: 10s
-      retries: 10
-
-networks:
-  frontend:
-    external: false
-  backend:
-    external: false

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.9'
 
 volumes:
-  app:
+  data:
 
 services:
   nginx:
@@ -24,7 +24,7 @@ services:
     networks:
       - frontend
     depends_on:
-      app:
+      - app
     command: "/bin/sh -c 'while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g \"daemon off;\"'"
   
   app:
@@ -36,14 +36,14 @@ services:
     ports:
       - 5000
     volumes:
-      - app:/ref-test/data
+      - data:/ref-test/data
       - ./logs:/ref-test/data/logs
     restart: unless-stopped
     networks:
       - frontend
       - backend
     depends_on:
-      postfix:
+      - postfix
 
   postfix:
     container_name: reftest_postfix

ref-test/app/__init__.py

@@ -1,5 +1,5 @@
 from .config import Production as Config
-from .models import *
+from .models import User
 from .extensions import bootstrap, csrf, db, login_manager, mail
 from .tools.logs import write
 
@@ -59,10 +59,4 @@ def create_app():
     app.register_blueprint(editor, url_prefix='/admin/editor')
     app.register_blueprint(view, url_prefix='/admin/view')
     
-    """Create Database Tables before First Request"""
-    @app.before_first_request
-    def _create_database_tables():
-        with app.app_context():
-            db.create_all()
-
     return app

ref-test/install.py

@@ -27,9 +27,7 @@ with app.app_context():
         with open(f'./{data}/.encryption.key', 'wb') as key_file:
             key = Fernet.generate_key()
             key_file.write(key)
-
-    """Create File for SQLite Database"""
-    if database_uri[0:6].lower() == 'sqlite':
-        if not database_exists(database_uri):
-            create_database(database_uri)
-            write('system.log', 'No SQLite file found. Creating a new database.')
+    if not database_exists(database_uri):
+        create_database(database_uri)
+        write('system.log', 'No database found. Creating a new database.')
+    db.create_all()