Merge pull request #1 from mohamedtaee/dev

Dev

Author: mohamedtaee

Dockerfile

@@ -1,15 +1,16 @@
-FROM python:3.7-alpine
+FROM python:3.11.2-slim
 
-ADD requirements.txt .
+WORKDIR /app
 
-RUN apk add python3-dev build-base linux-headers pcre-dev && pip install --no-cache-dir -r requirements.txt
+COPY . /app
 
-# adding application files
-ADD . /webapp
+RUN pip install --upgrade pip
 
-# configure path /webapp to HOME-dir
-ENV HOME /webapp
-WORKDIR /webapp
+RUN pip install --no-cache-dir -r requirements.txt
 
-ENTRYPOINT ["uwsgi"]
-CMD ["--http", "0.0.0.0:8080", "--wsgi-file", "wsgi.py", "--callable", "app", "--processes", "1", "--threads", "8"]
+EXPOSE 8080
+
+ENV FLASK_APP=app
+ENV FLASK_ENV=production
+
+CMD ["gunicorn", "--workers", "1", "--timeout", "5000", "--preload", "--bind", "0.0.0.0:8080", "wsgi:app"]

app/__init__.py

@@ -2,21 +2,22 @@
 from config import config
 from flask_moment import Moment
 
-
 moment = Moment()
 
 
 def create_app(config_name):
     app = Flask(__name__)
     app.config.from_object(config[config_name])
 
+    config[config_name].init_app(app)
+
     config[config_name].init_app(app)
     moment.init_app(app)
 
-    from app.ui import ui as ui_blueprint
-    app.register_blueprint(ui_blueprint)
+    from app.ui import views as ui_views
+    app.register_blueprint(ui_views.bp)
 
-    from app.api import api as api_blueprint
-    app.register_blueprint(api_blueprint, url_prefix='/api')
+    from app.api import endpoints as api_endpoints
+    app.register_blueprint(api_endpoints.bp)
 
     return app

app/api/__init__.py

@@ -1,5 +0,0 @@
-from flask import Blueprint
-
-api = Blueprint('api', __name__)
-
-from . import endpoints

app/api/endpoints.py

@@ -3,10 +3,10 @@
 import os
 import flask
 
-from app.api import api
+bp = flask.Blueprint('api', __name__, url_prefix='/api')
 
 
-@api.route('/config/<name>',  methods=['GET'])
+@bp.route('/config/<name>',  methods=['GET'])
 def get_config(name: str):
     """
     Reads the file with the corresponding name that was passed.
@@ -25,7 +25,7 @@ def get_config(name: str):
     return flask.render_template('config.html', name=name, file=_file), 200
 
 
-@api.route('/config/<name>', methods=['POST'])
+@bp.route('/config/<name>', methods=['POST'])
 def post_config(name: str):
     """
     Accepts the customized configuration and saves it in the configuration file with the supplied name.
@@ -45,7 +45,7 @@ def post_config(name: str):
     return flask.make_response({'success': True}), 200
 
 
-@api.route('/domains', methods=['GET'])
+@bp.route('/domains', methods=['GET'])
 def get_domains():
     """
     Reads all files from the configuration file directory and checks the state of the site configuration.
@@ -83,7 +83,7 @@ def get_domains():
     return flask.render_template('domains.html', sites_available=sites_available, sites_enabled=sites_enabled), 200
 
 
-@api.route('/domain/<name>', methods=['GET'])
+@bp.route('/domain/<name>', methods=['GET'])
 def get_domain(name: str):
     """
     Takes the name of the domain configuration file and
@@ -116,7 +116,7 @@ def get_domain(name: str):
     return flask.render_template('domain.html', name=name, file=_file, enabled=enabled), 200
 
 
-@api.route('/domain/<name>', methods=['POST'])
+@bp.route('/domain/<name>', methods=['POST'])
 def post_domain(name: str):
     """
     Creates the configuration file of the domain.
@@ -141,7 +141,7 @@ def post_domain(name: str):
     return response
 
 
-@api.route('/domain/<name>', methods=['DELETE'])
+@bp.route('/domain/<name>', methods=['DELETE'])
 def delete_domain(name: str):
     """
     Deletes the configuration file of the corresponding domain.
@@ -168,7 +168,7 @@ def delete_domain(name: str):
         return flask.jsonify({'success': False}), 400
 
 
-@api.route('/domain/<name>', methods=['PUT'])
+@bp.route('/domain/<name>', methods=['PUT'])
 def put_domain(name: str):
     """
     Updates the configuration file with the corresponding domain name.
@@ -191,7 +191,7 @@ def put_domain(name: str):
     return flask.make_response({'success': True}), 200
 
 
-@api.route('/domain/<name>/enable', methods=['POST'])
+@bp.route('/domain/<name>/enable', methods=['POST'])
 def enable_domain(name: str):
     """
     Activates the domain in Nginx so that the configuration is applied.

app/ui/__init__.py

@@ -1,5 +0,0 @@
-from flask import Blueprint
-
-ui = Blueprint('ui', __name__)
-
-from . import views

app/ui/views.py

@@ -1,16 +1,17 @@
-from app.ui import ui
-import flask
+from flask import Blueprint, current_app, render_template
 import os
 
+bp = Blueprint('ui', __name__)
 
-@ui.route('/',  methods=['GET'])
+
+@bp.route('/',  methods=['GET'])
 def index():
     """
     Delivers the home page of Nginx UI.
 
     :return: Rendered HTML document.
     :rtype: str
     """
-    nginx_path = flask.current_app.config['NGINX_PATH']
+    nginx_path = current_app.config['NGINX_PATH']
     config = [f for f in os.listdir(nginx_path) if os.path.isfile(os.path.join(nginx_path, f))]
-    return flask.render_template('index.html', config=config)
+    return render_template('index.html', config=config)

docker-compose.yml

@@ -1,19 +1,19 @@
 version: '3'
 services:
-  nginx-ui:
-    container_name: nginx-ui
+  flask-nginx-ui:
+    container_name: flask-nginx-ui
     build: .
-    image: nginx-ui:latest
+    image: flask-nginx-ui:latest
     ports:
-      - 8080:8080
+      - "8080:8080"
     volumes:
       - nginx:/etc/nginx
 
   nginx:
     container_name: nginx
-    image: nginx:1.18.0-alpine
+    image: nginx:alpine3.19
     ports:
-      - 80:80
+      - "443:443"
     volumes:
       - nginx:/etc/nginx
 

requirements.txt

@@ -1,9 +1,3 @@
-click==7.1.2
-Flask==1.1.2
-Flask-Moment==0.9.0
-itsdangerous==1.1.0
-Jinja2==2.11.3
-MarkupSafe==1.1.1
-pytz==2020.1
-uWSGI==2.0.18
-Werkzeug==1.0.1
+Flask~=3.0.3
+gunicorn~=22.0.0
+Flask-Moment~=1.0.5