From 0aefdcc162d8ae981443637b65fcbe43f9e84412 Mon Sep 17 00:00:00 2001
From: Kevin Chung <kchung@nyu.edu>
Date: Fri, 9 Feb 2018 01:56:35 -0500
Subject: [PATCH] Update requirements.txt and fix docker-compose mariadb issue
 (#566)

* Update dependencies in requirements.txt
* Fix issue where mariadb would remove gunicorn database connections in docker-compose
---
 docker-compose.yml |  2 ++
 requirements.txt   | 18 +++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 5de5bd40..ff3bba9d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,6 +16,8 @@ services:
 
   db:
     image: mariadb:10.2
+    # This command is required to set important mariadb defaults
+    command: [mysqld, --character-set-server=utf8mb4, --collation-server=utf8mb4_unicode_ci, --wait_timeout=28800]
     environment:
       - MYSQL_ROOT_PASSWORD=ctfd
       - MYSQL_USER=ctfd
diff --git a/requirements.txt b/requirements.txt
index 30f2d8e7..7ada7695 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,20 +1,20 @@
 Flask==0.12.2
-Flask-SQLAlchemy==2.3.1
+Flask-SQLAlchemy==2.3.2
 Flask-Session==0.3.1
 Flask-Caching==1.3.3
 Flask-Migrate==2.1.1
-Flask-Script>=2.0.6
-SQLAlchemy==1.1.14
-SQLAlchemy-Utils>=0.32.17
+Flask-Script==2.0.6
+SQLAlchemy==1.2.2
+SQLAlchemy-Utils==0.32.21
 passlib==1.7.1
-bcrypt==3.1.3
+bcrypt==3.1.4
 six==1.11.0
 itsdangerous==0.24
-requests==2.18.1
-PyMySQL==0.7.11
+requests==2.18.4
+PyMySQL==0.8.0
 gunicorn==19.7.1
-dataset==1.0.2
-mistune==0.7.4
+dataset==1.0.5
+mistune==0.8.3
 netaddr==0.7.19
 redis==2.10.6
 datafreeze==0.1.0