Merge pull request #1995 from predakanga/master

Added support for IPC namespaces, fixes GH-1689
This commit is contained in:
mnowster 2015-09-17 17:14:44 +01:00
commit 1c823597bb
4 changed files with 8 additions and 2 deletions

View file

@ -382,7 +382,7 @@ Override the default labeling scheme for each container.
- label:user:USER
- label:role:ROLE
### working\_dir, entrypoint, user, hostname, domainname, mac\_address, mem\_limit, memswap\_limit, privileged, restart, stdin\_open, tty, cpu\_shares, cpuset, read\_only, volume\_driver
### working\_dir, entrypoint, user, hostname, domainname, mac\_address, mem\_limit, memswap\_limit, privileged, ipc, restart, stdin\_open, tty, cpu\_shares, cpuset, read\_only, volume\_driver
Each of these is a single value, analogous to its
[docker run](https://docs.docker.com/reference/run/) counterpart.
@ -403,6 +403,8 @@ Each of these is a single value, analogous to its
memswap_limit: 2000000000
privileged: true
ipc: host
restart: always
stdin_open: true