README.md in kitchen-docker-1.1.0.beta vs README.md in kitchen-docker-1.2.0
- old
+ new
@@ -30,12 +30,14 @@
```
## Default Configuration
This driver can determine an image and platform type for a select number of
-platforms. Currently, the following platform names are supported:
+platforms.
+Examples:
+
```
---
platforms:
- name: ubuntu-12.04
- name: centos-6.4
@@ -56,10 +58,26 @@
platform: centos
```
## Configuration
+### binary
+
+The Docker binary to use.
+
+The default value is `docker`.
+
+Examples:
+
+```
+ binary: docker.io
+```
+
+```
+ binary: /opt/docker
+```
+
### socket
The Docker daemon socket to use. By default, Docker will listen on
`unix:///var/run/docker.sock`, and no configuration here is required. If
Docker is binding to another host/port or Unix socket, you will need to set
@@ -79,26 +97,23 @@
### image
The Docker image to use as the base for the suite containers. You can find
images using the [Docker Index][docker_index].
-The default will be determined by the Platform name, if a default exists
-(see the Default Configuration section for more details). If a default
-cannot be computed, then the default value is `base`, an official Ubuntu
-[image][docker_default_image].
+The default will be computed, using the platform name (see the Default
+Configuration section for more details).
### platform
The platform of the chosen image. This is used to properly bootstrap the
suite container for Test Kitchen. Kitchen Docker currently supports:
* `debian` or `ubuntu`
* `rhel` or `centos`
-The default will be determined by the Platform name, if a default exists
-(see the Default Configuration section for more details). If a default
-cannot be computed, then the default value is `ubuntu`.
+The default will be computed, using the platform name (see the Default
+Configuration section for more details).
### require\_chef\_omnibus
Determines whether or not a Chef [Omnibus package][chef_omnibus_dl] will be
installed. There are several different behaviors available:
@@ -248,9 +263,19 @@
Examples:
```
privileged: true
+```
+
+## dockerfile
+
+Use a custom Dockerfile, instead of having Kitchen-Docker build one for you.
+
+Examples:
+
+```
+ dockerfile: test/Dockerfile
```
## Development
* Source hosted at [GitHub][repo]