summaryrefslogtreecommitdiff
path: root/roles/docker/templates
AgeCommit message (Expand)Author
2017-10-09Merge pull request #5705 from mgugino-upstream-stage/docker-partof-iptablesScott Dodson
2017-10-09Add PartOf to docker systemd service unit.Michael Gugino
2017-10-09crio: use systemd managerGiuseppe Scrivano
2017-10-06crio.conf.j2: sync from upstreamGiuseppe Scrivano
2017-10-06cri-o: use overlay instead of overlay2Giuseppe Scrivano
2017-09-29Fix typo in files (Docker registries)William Burton
2017-09-21Move additional/block/insecure registires to /etc/containers/registries.confMichael Gugino
2017-09-06Merge pull request #5202 from giuseppe/crio-additional-registriesOpenShift Bot
2017-08-25cri-o: change to system runcGiuseppe Scrivano
2017-08-24cri-o: add support for additional registriesGiuseppe Scrivano
2017-08-04cri-o: configure the CNI networkGiuseppe Scrivano
2017-08-03cri-o: Ensure overlay is availableSteve Milner
2017-08-03cri-o: Default insecure registries to ""Steve Milner
2017-08-03crio: use a template for the configurationGiuseppe Scrivano
2017-05-17systemcontainercustom.conf.j2: use Environment instead of ENVIRONMENTGiuseppe Scrivano
2017-05-12Merge pull request #4174 from ashcrow/remove-userland-proxyOpenShift Bot
2017-05-12Remove userland-proxy-path from daemon.jsonSteve Milner
2017-05-12Fix whistespace issues in custom templateSteve Milner
2017-05-11Remove unused daemon.json keysSteve Milner
2017-05-11Merge pull request #4158 from ganhuang/lower_boolScott Dodson
2017-05-10Merge pull request #4152 from sdodson/iptables-defaultOpenShift Bot
2017-05-11lower case in /etc/daemon.json and correct block-registryGan Huang
2017-05-10Default to iptables on masterScott Dodson
2017-05-10Rename blocked-registries to block-registriesSteve Milner
2017-05-10Ensure true is lowercase in daemon.jsonSteve Milner
2017-05-08Use local variables for daemon.json templateSteve Milner
2017-05-05Fix 1448368, and some other minors issuesGan Huang
2017-05-03System container dockerSteve Milner
2017-03-07Loosely couple docker to iptables serviceRussell Teague
2016-11-11Resolve docker and iptables service dependenciesRussell Teague