README.md in kitchen-docker-1.7.0 vs README.md in kitchen-docker-2.0.0
- old
+ new
@@ -2,11 +2,11 @@
A Test Kitchen Driver for Docker.
## Requirements
-* [Docker][docker_getting_started]
+* [Docker][docker_installation] **(>= 1.2)**
## Installation and Setup
Please read the Test Kitchen [docs][test_kitchen_docs] for more details.
@@ -186,11 +186,11 @@
This determines if images are automatically removed when the suite container is
destroyed.
The default value is `false`.
-### run_command
+### run\_command
Sets the command used to run the suite container.
The default value is `/usr/sbin/sshd -D -o UseDNS=no -o UsePAM=no -o PasswordAuthentication=yes`.
@@ -224,11 +224,11 @@
volume:
- /ftp
- /srv
```
-### volumes_from
+### volumes\_from
Mount volumes managed by other containers.
Examples:
@@ -315,21 +315,58 @@
```
privileged: true
```
-## dockerfile
+### cap\_add
+Adds a capability to the running container.
+
+Examples:
+
+````
+cap_add:
+- SYS_PTRACE
+
+````
+
+### cap\_drop
+
+Drops a capability from the running container.
+
+Examples:
+
+````
+cap_drop:
+- CHOWN
+
+````
+
+### security\_opt
+
+Apply a security profile to the Docker container. Allowing finer granularity of
+access control than privileged mode, through leveraging SELinux/AppArmor
+profiles to grant access to specific resources.
+
+Examples:
+
+```
+security_opt:
+ - apparmor:my_profile
+```
+
+### dockerfile
+
Use a custom Dockerfile, instead of having Kitchen-Docker build one for you.
Examples:
```
dockerfile: test/Dockerfile
```
-### instance_name
+### instance\_name
Set the name of container to link to other container(s).
Examples:
@@ -353,11 +390,11 @@
links:
- db:db
- kvs:kvs
```
-### publish_all
+### publish\_all
Publish all exposed ports to the host interfaces.
This option used to communicate between some containers.
The default value is `false`.
@@ -394,10 +431,10 @@
[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
-[docker_getting_started]: http://www.docker.io/gettingstarted/
+[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/