Add more complete port mapping syntax
Adding --link option for docker containers