diff --git a/requirements.txt b/requirements.txt index 7d30ac438..73ce4da45 100644 --- a/requirements.txt +++ b/requirements.txt @@ -38,7 +38,7 @@ marisa-trie==0.7 mixpanel-py==3.2.1 mock==1.0.1 paramiko==1.15.2 -peewee==2.4.5 +peewee==2.4.7 psycopg2==2.5.4 py-bcrypt==0.4 pycrypto==2.6.1 diff --git a/test/fulldbtest.sh b/test/fulldbtest.sh index 49ad1f999..d3fa0caa7 100755 --- a/test/fulldbtest.sh +++ b/test/fulldbtest.sh @@ -2,14 +2,14 @@ set -e up_mysql() { # Run a SQL database on port 3306 inside of Docker. - docker run --name mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password -d mysql + docker run --name mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password -d mysql:5.7 # Sleep for 5s to get MySQL get started. echo 'Sleeping for 10...' sleep 10 # Add the database to mysql. - docker run --rm --link mysql:mysql mysql sh -c 'echo "create database genschema" | mysql -h"$MYSQL_PORT_3306_TCP_ADDR" -P"$MYSQL_PORT_3306_TCP_PORT" -uroot -ppassword' + docker run --rm --link mysql:mysql mysql:5.7 sh -c 'echo "create database genschema" | mysql -h"$MYSQL_PORT_3306_TCP_ADDR" -P"$MYSQL_PORT_3306_TCP_PORT" -uroot -ppassword' } down_mysql() {