summaryrefslogtreecommitdiffstats
path: root/roles/docker/templates/crio.conf.j2
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5202 from giuseppe/crio-additional-registriesOpenShift Bot2017-09-061-0/+5
|\ | | | | Merged by openshift-bot
| * cri-o: add support for additional registriesGiuseppe Scrivano2017-08-241-0/+5
| | | | | | | | | | | | | | Support added to CRI-O with: https://github.com/kubernetes-incubator/cri-o/commit/a35727c80bd2a26613aae21db00628045cb9be24 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | cri-o: change to system runcGiuseppe Scrivano2017-08-251-1/+1
|/ | | | | | | Newer versions of cri-o do not carry runc but use the one from the system. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* cri-o: Default insecure registries to ""Steve Milner2017-08-031-1/+1
|
* crio: use a template for the configurationGiuseppe Scrivano2017-08-031-0/+132
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>