Merge branch 'master' of https://github.com/cairis-platform/cairis

docker/buildDemo.sh

@@ -13,7 +13,7 @@ sudo docker stop cairis-mysql
 sudo docker rm $(sudo docker ps -aq)
 sudo docker rmi $(sudo docker images -q)
 sudo docker volume rm $(docker volume ls)
-sudo docker run --name cairis-mysql -e MYSQL_ROOT_PASSWORD=my-secret-pw -d mysql:5.7 --thread_stack=512K
+sudo docker run --name cairis-mysql -e MYSQL_ROOT_PASSWORD=my-secret-pw -d mysql:latest --thread_stack=512K
 sudo docker run --name cairis-docs -d -v cairisDocumentation:/tmpDocker -v cairisImage:/images -t shamalfaily/cairis-docs
 sudo docker run --name CAIRIS -d --link cairis-mysql:mysql --link cairis-docs:docs -P -p 80:8000 --net=bridge -v cairisDocumentation:/tmpDocker -v cairisImage:/images shamalfaily/cairis
 

docker/createdb.sql

@@ -7,9 +7,10 @@ create table cairis_owner.db_owner(db varchar(64), owner varchar(32), primary ke
 
 drop user if exists cairis_test;
 create user if not exists 'cairis_test'@'%' identified by 'cairis_test';
-grant usage on `cairis_test`.* to 'cairis_test'@'%' with max_queries_per_hour 0 max_connections_per_hour 0 max_updates_per_hour 0 max_user_connections 0;
+grant usage on `cairis_test`.* to 'cairis_test'@'%';
 flush privileges;
 
+drop database if exists `cairis_test_default`;
 create database if not exists `cairis_test_default`;
 grant all privileges on `cairis_test_default`.* to 'cairis_test'@'%';
 set global max_sp_recursion_depth = 255;

docker/requirements.txt

@@ -16,12 +16,13 @@ Flask-RESTful>= 0.3.5
 flask-restful-swagger>= 0.19
 Flask-Cors>= 3.0.2
 Flask-SQLAlchemy>=2.1
-Flask-Security>=1.7.5
+Flask-Security-Too>=3.3.2
 Flask-Script>=2.0.5
 Flask-OAuthlib>=0.9.3
 mako>=1.0.4
 lxml>=3.6.4
 openpyxl>=2.4.0
+SQLAlchemy==1.3.20
 bcrypt>=3.1.6
 python-magic>=0.4.15
 email_validator>=1.0.5

docs/install.rst

@@ -49,15 +49,15 @@ For the full install (with pdf export functionality) download and run the contai
 
 .. code-block:: bash
  
-   sudo docker run --name cairis-mysql -e MYSQL_ROOT_PASSWORD=my-secret-pw -d mysql:5.7 --thread_stack=256K
+   sudo docker run --name cairis-mysql -e MYSQL_ROOT_PASSWORD=my-secret-pw -d mysql:latest --thread_stack=256K --max_sp_recursion_depth=255 --log_bin_trust_function_creators=1
    sudo docker run --name cairis-docs -d -v cairisDocumentation:/tmpDocker -v cairisImage:/images -t shamalfaily/cairis-docs
    sudo docker run --name CAIRIS -d --link cairis-mysql:mysql --link cairis-docs:docs -P -p 80:8000 --net=bridge -v cairisDocumentation:/tmpDocker -v cairisImage:/images shamalfaily/cairis
 
 For the smaller install (without pdf export functionality) download and run the container, and its linked mysql container:
 
 .. code-block:: bash
  
-   sudo docker run --name cairis-mysql -e MYSQL_ROOT_PASSWORD=my-secret-pw -d mysql:5.7 --thread_stack=256K
+   sudo docker run --name cairis-mysql -e MYSQL_ROOT_PASSWORD=my-secret-pw -d mysql:latest --thread_stack=256K --max_sp_recursion_depth=255 --log_bin_trust_function_creators=1
    sudo docker run --name CAIRIS --link cairis-mysql:mysql -d -P -p 80:8000 --net=bridge shamalfaily/cairis
 
 If you run the above commands on macOS (and possibly other non-Linux platformns), you might get the error *links are only supported for user-defined networks*.  If so, you should instead run the below commands to download and run your containers:
@@ -66,7 +66,7 @@ If you run the above commands on macOS (and possibly other non-Linux platformns)
    
    NET=cairisnet
    docker network create -d bridge $NET
-   docker run --name cairis-mysql -e MYSQL_ROOT_PASSWORD=my-secret-pw -d mysql:5.7 --thread_stack=256K
+   docker run --name cairis-mysql -e MYSQL_ROOT_PASSWORD=my-secret-pw -d mysql:latest --thread_stack=256K --max_sp_recursion_depth=255 --log_bin_trust_function_creators=1
    docker network connect $NET cairis-mysql
    docker run --name CAIRIS -d -P -p 80:8000 --net=$NET shamalfaily/cairis