Merge pull request #2130 from thostetler/limit-server-memory-usage

Add 1g memory limit on docker server

server.sh

@@ -7,7 +7,10 @@ fi
 
 home=`pwd`
 target=${1:-src} # workdir that will become webserver's root
+extraargs=${2:- -m=1g}
 
+# add extra args (to docker) like this:
+# ./server.sh src '-m=1g --memory-swap=1g ...'
 
 docker rm -f bbb-nginx 2>/dev/null
-docker run -p 8000:80 -v $home/$target/:/app/production -v $home/nginx.conf:/etc/nginx/nginx.conf bbb-nginx nginx
+docker run -p 8000:80 -v $home/$target/:/app/production -v $home/nginx.conf:/etc/nginx/nginx.conf $extraargs bbb-nginx nginx