Merge branch 'main' into gh-73-v1

Author: brendan marshall

docker-compose.yml

@@ -2,7 +2,7 @@ version: '3'
 services:
   gapps:
     container_name: gapps
-    image: bmarsh13/gapps:3.4.6
+    image: bmarsh13/gapps:3.4.7
     depends_on:
       - postgres
     networks:
@@ -17,7 +17,7 @@ services:
       - DEFAULT_PASSWORD=${DEFAULT_PASSWORD:-admin}
       - RESET_DB=${RESET_DB:-no}
       - DOC_LINK=https://github.com/bmarsh9/gapps
-      - VERSION=${VERSION:-3.4.6}
+      - VERSION=${VERSION:-3.4.7}
       - APP_NAME=Gapps
       - POSTGRES_USER=${POSTGRES_USER:-db1}
       - POSTGRES_HOST=${POSTGRES_HOST:-postgres}
@@ -26,7 +26,7 @@ services:
       - GUNICORN_WORKERS=2
   gapps-worker:
     container_name: gapps-worker
-    image: bmarsh13/gapps:3.4.6
+    image: bmarsh13/gapps:3.4.7
     depends_on:
       - postgres
     networks:
@@ -37,7 +37,7 @@ services:
     restart: unless-stopped
     environment:
       - SQLALCHEMY_DATABASE_URI=postgresql://${POSTGRES_USER:-db1}:${POSTGRES_PASSWORD:-db1}@${POSTGRES_HOST:-postgres}/${POSTGRES_DB:-db1}
-      - VERSION=${VERSION:-3.4.6}
+      - VERSION=${VERSION:-3.4.7}
       - APP_NAME=Gapps
       - AS_WORKER=yes
       - POSTGRES_USER=${POSTGRES_USER:-db1}

requirements.txt

@@ -2,14 +2,14 @@ alembic==1.4.3
 arrow==0.17.0
 Babel==2.10.3
 blinker==1.4
-certifi==2022.6.15
+certifi==2022.12.7
 chardet==3.0.4
 click==8.1.3
 dnspython==2.2.1
 email-validator==1.1.1
-Flask==2.1.3
+Flask==2.2.5
 Flask-Babel==2.0.0
-Flask-Login==0.6.1
+Flask-Login==0.6.2
 Flask-Mail==0.9.1
 Flask-Migrate==2.5.3
 Flask-Moment==0.10.0
@@ -18,18 +18,18 @@ Flask-SQLAlchemy==2.5.1
 idna==2.6
 itsdangerous==2.0.0
 Jinja2==3.0.3
-Mako==1.2.0
+Mako==1.2.2
 MarkupSafe==2.1.1
 parsedatetime==2.6
 psycopg2==2.8.6
 python-dateutil==2.8.2
 pytz==2022.1
-requests==2.18.4
+requests==2.31.0
 six==1.16.0
 SQLAlchemy==1.3.20
-urllib3==1.22
+urllib3==1.26.5
 #uWSGI==2.0.20
 gunicorn==20.1.0
-Werkzeug==2.1.2
+Werkzeug==2.2.3
 procrastinate==0.27.0
 weasyprint==58.1