summaryrefslogtreecommitdiffstats
path: root/roles/docker/templates
Commit message (Expand)AuthorAgeFilesLines
* crio: sync crio.confGiuseppe Scrivano2017-11-141-0/+5
* cri-o: Set max log size to 50 mbMrunal Patel2017-10-271-1/+1
* Merge pull request #5705 from mgugino-upstream-stage/docker-partof-iptablesScott Dodson2017-10-091-0/+6
|\
| * Add PartOf to docker systemd service unit.Michael Gugino2017-10-091-0/+6
* | crio: use systemd managerGiuseppe Scrivano2017-10-091-1/+1
|/
* crio.conf.j2: sync from upstreamGiuseppe Scrivano2017-10-061-1/+23
* cri-o: use overlay instead of overlay2Giuseppe Scrivano2017-10-061-2/+2
* Fix typo in files (Docker registries)William Burton2017-09-291-1/+1
* Move additional/block/insecure registires to /etc/containers/registries.confMichael Gugino2017-09-211-0/+46
* Merge pull request #5202 from giuseppe/crio-additional-registriesOpenShift Bot2017-09-061-0/+5
|\
| * cri-o: add support for additional registriesGiuseppe Scrivano2017-08-241-0/+5
* | cri-o: change to system runcGiuseppe Scrivano2017-08-251-1/+1
|/
* cri-o: configure the CNI networkGiuseppe Scrivano2017-08-041-0/+5
* cri-o: Ensure overlay is availableSteve Milner2017-08-031-0/+2
* cri-o: Default insecure registries to ""Steve Milner2017-08-031-1/+1
* crio: use a template for the configurationGiuseppe Scrivano2017-08-031-0/+132
* systemcontainercustom.conf.j2: use Environment instead of ENVIRONMENTGiuseppe Scrivano2017-05-171-3/+3
* 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