summaryrefslogtreecommitdiffstats
path: root/roles/docker/templates
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4174 from ashcrow/remove-userland-proxyOpenShift Bot2017-05-121-2/+1
|\
| * Remove userland-proxy-path from daemon.jsonSteve Milner2017-05-121-2/+1
* | Fix whistespace issues in custom templateSteve Milner2017-05-121-6/+6
|/
* Remove unused daemon.json keysSteve Milner2017-05-111-45/+0
* Merge pull request #4158 from ganhuang/lower_boolScott Dodson2017-05-111-2/+2
|\
| * lower case in /etc/daemon.json and correct block-registryGan Huang2017-05-111-2/+2
* | Merge pull request #4152 from sdodson/iptables-defaultOpenShift Bot2017-05-101-1/+1
|\ \ | |/ |/|
| * Default to iptables on masterScott Dodson2017-05-101-1/+1
* | Rename blocked-registries to block-registriesSteve Milner2017-05-101-1/+1
* | Ensure true is lowercase in daemon.jsonSteve Milner2017-05-101-1/+1
|/
* Use local variables for daemon.json templateSteve Milner2017-05-081-6/+6
* Fix 1448368, and some other minors issuesGan Huang2017-05-052-4/+6
* System container dockerSteve Milner2017-05-032-0/+81
* Loosely couple docker to iptables serviceRussell Teague2017-03-071-1/+1
* Resolve docker and iptables service dependenciesRussell Teague2016-11-111-0/+5