diff --git a/ops/packer/README.md b/ops/packer/README.md index 2715d4b1..6f534228 100644 --- a/ops/packer/README.md +++ b/ops/packer/README.md @@ -31,11 +31,22 @@ Usage ### Docker -Spin up an Iris instance and connect to existing MySQL DB: +Set up mysql DB (if needed). 5.6 will work out-of-box. 5.7 requires a change to `SQL_MODE` to +remove `ONLY_FULL_GROUP_BY` (set `TRUE` as default for 5.7+). Find the IP address of the docker +container using docker inspect. +```bash +docker run --name iris_mysql -d -e MYSQL_ROOT_PASSWORD=admin mysql:5.6 +export DB_IP_ADDRESS=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' iris_mysql) +``` + +Spin up an Iris instance and connect to existing MySQL DB. Make sure user and password are +configure to match your MySQL setup (here, root:admin). These credentials should be changed +for non-toy deployments. If you're not using the container spun up in the previous paragraph, +replace `$DB_IP_ADDRESS` with the IP of your database host. ```bash docker run -d -e DOCKER_DB_BOOTSTRAP=1 \ - -e IRIS_CFG_DB_USER=root -e IRIS_CFG_DB_PASSWORD=admin -e IRIS_CFG_DB_HOST=IP_ADDRESS \ + -e IRIS_CFG_DB_USER=root -e IRIS_CFG_DB_PASSWORD=admin -e IRIS_CFG_DB_HOST=$DB_IP_ADDRESS \ --name iris -p 16649:16649 \ quay.io/iris/iris:latest ``` diff --git a/setup.py b/setup.py index 86f1ec6d..1179f674 100644 --- a/setup.py +++ b/setup.py @@ -38,7 +38,7 @@ 'beaker==1.10.0', 'cryptography==2.3', 'webassets==0.12.1', - 'python-ldap==2.4.9', + 'python-ldap==3.1.0', 'exchangelib==1.10.0', 'setproctitle==1.1.8', 'pyfcm==1.4.3',