Merge pull request #1142 from calou/master

Added support of option mac-address
This commit is contained in:
Aanand Prasad 2015-06-17 14:39:00 -07:00
commit 77c939b256
3 changed files with 11 additions and 1 deletions

View file

@ -365,7 +365,7 @@ security_opt:
- label:role:ROLE
```
### working\_dir, entrypoint, user, hostname, domainname, mem\_limit, privileged, restart, stdin\_open, tty, cpu\_shares, cpuset, read\_only
### working\_dir, entrypoint, user, hostname, domainname, mac\_address, mem\_limit, privileged, restart, stdin\_open, tty, cpu\_shares, cpuset, read\_only
Each of these is a single value, analogous to its
[docker run](https://docs.docker.com/reference/run/) counterpart.
@ -381,6 +381,8 @@ user: postgresql
hostname: foo
domainname: foo.com
mac_address: 02:42:ac:11:65:43
mem_limit: 1000000000
privileged: true
@ -389,6 +391,7 @@ restart: always
stdin_open: true
tty: true
read_only: true
```
## Compose documentation