README.md in kitchen-docker-2.4.0 vs README.md in kitchen-docker-2.5.0

- old
+ new

@@ -434,10 +434,44 @@ ```yaml build_context: true ``` +### build_options + +Extra command-line options to pass to `docker build` when creating the image. + +Examples: + +```yaml + build_options: --rm=false +``` + +```yaml + build_options: + rm: false + build-arg: something +``` + +### run_options + +Extra command-line options to pass to `docker run` when starting the container. + +Examples: + +```yaml + run_options: --ip=1.2.3.4 +``` + +```yaml + run_options: + tmpfs: + - /run/lock + - /tmp + net: br3 +``` + ## Development * Source hosted at [GitHub][repo] * Report issues/questions/feature requests on [GitHub Issues][issues] @@ -451,24 +485,26 @@ 4. Push to the branch (`git push origin my-new-feature`) 5. Create new Pull Request ## Authors -Created and maintained by [Sean Porter][author] (<portertech@gmail.com>) +Created by [Sean Porter][author] (<portertech@gmail.com>). +Maintained by [Noah Kantrowitz][https://github.com/coderanger]. + ## License Apache 2.0 (see [LICENSE][license]) [author]: https://github.com/portertech -[issues]: https://github.com/portertech/kitchen-docker/issues -[license]: https://github.com/portertech/kitchen-docker/blob/master/LICENSE -[repo]: https://github.com/portertech/kitchen-docker +[issues]: https://github.com/test-kitchen/kitchen-docker/issues +[license]: https://github.com/test-kitchen/kitchen-docker/blob/master/LICENSE +[repo]: https://github.com/test-kitchen/kitchen-docker [docker_installation]: https://docs.docker.com/installation/#installation [docker_upstart_issue]: https://github.com/dotcloud/docker/issues/223 [docker_index]: https://index.docker.io/ [docker_default_image]: https://index.docker.io/_/base/ [test_kitchen_docs]: http://kitchen.ci/docs/getting-started/ -[chef_omnibus_dl]: http://www.opscode.com/chef/install/ +[chef_omnibus_dl]: https://downloads.chef.io/chef-client/ [cpu_shares]: https://docs.fedoraproject.org/en-US/Fedora/17/html/Resource_Management_Guide/sec-cpu.html [memory_limit]: https://docs.fedoraproject.org/en-US/Fedora/17/html/Resource_Management_Guide/sec-memory.html