chore

Author: michael-yin

.env/.dev-sample

@@ -1,7 +1,7 @@
 FLASK_DEBUG=1
 FLASK_CONFIG=development
-DATABASE_URL=postgresql://flask_celery:flask_celery@db/flask_celery
+DATABASE_URL=postgresql+psycopg://flask_celery:flask_celery@db/flask_celery
 SECRET_KEY=my_precious
 CELERY_BROKER_URL=redis://redis:6379/0
 CELERY_RESULT_BACKEND=redis://redis:6379/0
-SOCKETIO_MESSAGE_QUEUE=redis://redis:6379/0
+SOCKETIO_MESSAGE_QUEUE=redis://redis:6379/0

.env/.prod-sample

@@ -1,6 +1,6 @@
 FLASK_DEBUG=0
 FLASK_CONFIG=production
-DATABASE_URL=postgresql://flask_celery:flask_celery@db/flask_celery
+DATABASE_URL=postgresql+psycopg://flask_celery:flask_celery@db/flask_celery
 SECRET_KEY=my_precious
 CELERY_BROKER_URL=amqp://admin:admin@rabbitmq:5672/
 CELERY_RESULT_BACKEND=redis://redis:6379/0

app.py

@@ -1,9 +1,13 @@
-import eventlet
-eventlet.monkey_patch()
+import os
+if not os.environ.get('FLASK_RUN_FROM_CLI'):
+    # avoid patching if running with flask shell
+    import eventlet
+    eventlet.monkey_patch()
 
 from project import create_app, ext_celery, socketio
 
 app = create_app()
+celery = ext_celery.celery
 
 
 @app.route("/")
@@ -16,5 +20,6 @@ def hello_world():
         app,
         debug=True,
         use_reloader=True,
-        host='0.0.0.0'
+        host='0.0.0.0',
+        allow_unsafe_werkzeug=True,
     )

compose/local/flask/Dockerfile

@@ -1,12 +1,12 @@
-FROM python:3.9-slim-buster
+FROM python:3.11-slim-buster
 
 ENV PYTHONUNBUFFERED 1
 ENV PYTHONDONTWRITEBYTECODE 1
 
 RUN apt-get update \
   # dependencies for building Python packages
   && apt-get install -y build-essential \
-  # psycopg2 dependencies
+  # psycopg dependencies
   && apt-get install -y libpq-dev \
   # Additional dependencies
   && apt-get install -y telnet netcat \

compose/local/flask/entrypoint

@@ -11,7 +11,7 @@ postgres_ready() {
 python << END
 import sys
 
-import psycopg2
+import psycopg
 import urllib.parse as urlparse
 import os
 
@@ -23,14 +23,14 @@ host = url.hostname
 port = url.port
 
 try:
-    psycopg2.connect(
+    psycopg.connect(
         dbname=dbname,
         user=user,
         password=password,
         host=host,
         port=port
     )
-except psycopg2.OperationalError:
+except psycopg.OperationalError:
     sys.exit(-1)
 sys.exit(0)
 

compose/local/flask/start

@@ -6,4 +6,4 @@ set -o nounset
 
 flask db upgrade
 # flask run --host=0.0.0.0
-python app.py
+python app.py

compose/production/flask/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9-slim-buster
+FROM python:3.11-slim-buster
 
 ENV PYTHONUNBUFFERED 1
 ENV PYTHONDONTWRITEBYTECODE 1

compose/production/flask/entrypoint

@@ -11,7 +11,7 @@ postgres_ready() {
 python << END
 import sys
 
-import psycopg2
+import psycopg
 import urllib.parse as urlparse
 import os
 
@@ -23,14 +23,14 @@ host = url.hostname
 port = url.port
 
 try:
-    psycopg2.connect(
+    psycopg.connect(
         dbname=dbname,
         user=user,
         password=password,
         host=host,
         port=port
     )
-except psycopg2.OperationalError:
+except psycopg.OperationalError:
     sys.exit(-1)
 sys.exit(0)
 

compose/production/nginx/Dockerfile

@@ -1,4 +1,4 @@
-FROM nginx:1.23-alpine
+FROM nginx:1.27-alpine
 
 RUN rm /etc/nginx/conf.d/default.conf
 COPY nginx.conf /etc/nginx/conf.d

compose/production/nginx/nginx.conf

@@ -20,7 +20,7 @@ server {
         client_max_body_size 20M;
     }
     location /upload/ {
-        alias /app/upload/;
+        alias /app/uploadfiles/;
     }
 
     location /socket.io {