summaryrefslogtreecommitdiff
path: root/roles/docker/templates
AgeCommit message (Collapse)Author
2017-12-01Implement container runtime roleMichael Gugino
2017-11-14crio: sync crio.confGiuseppe Scrivano
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-10-27cri-o: Set max log size to 50 mbMrunal Patel
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2017-10-09Merge pull request #5705 from mgugino-upstream-stage/docker-partof-iptablesScott Dodson
Add PartOf to docker systemd service unit.
2017-10-09Add PartOf to docker systemd service unit.Michael Gugino
Currently, if iptables service is restarted, existing iptables rules are removed. Docker adds iptables rules dyanmically upon startup and container creation. Restarting the iptables service results in a loss of these needed iptables rules. This commit ensures that if iptables service is restarted by anisble or the user, docker is also restarted. This ensures the proper dynamic iptables rules are in place for docker. Fixes: openshift/origin#16709
2017-10-09crio: use systemd managerGiuseppe Scrivano
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-10-06crio.conf.j2: sync from upstreamGiuseppe Scrivano
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-10-06cri-o: use overlay instead of overlay2Giuseppe Scrivano
overlay2 and overlay are the same driver. Upstream CRI-O is going to drop any reference to overlay2 and use only overlay. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-09-29Fix typo in files (Docker registries)William Burton
2017-09-21Move additional/block/insecure registires to /etc/containers/registries.confMichael Gugino
This commit moves additional/block/insecure registries to /etc/containers/registries.conf and comments existing lines in /etc/sysconfig/docker. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1460930
2017-09-06Merge pull request #5202 from giuseppe/crio-additional-registriesOpenShift Bot
Merged by openshift-bot
2017-08-25cri-o: change to system runcGiuseppe Scrivano
Newer versions of cri-o do not carry runc but use the one from the system. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-08-24cri-o: add support for additional registriesGiuseppe Scrivano
Support added to CRI-O with: https://github.com/kubernetes-incubator/cri-o/commit/a35727c80bd2a26613aae21db00628045cb9be24 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-08-04cri-o: configure the CNI networkGiuseppe Scrivano
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-08-03cri-o: Ensure overlay is availableSteve Milner
Some distro releases may not have overlay loaded into the kernel. This change looks for overlay via lsmod and, if it isn't already there, uses modprobe to load it in and then drops a load config into /etc/modules-load.d/overlay.conf.
2017-08-03cri-o: Default insecure registries to ""Steve Milner
2017-08-03crio: use a template for the configurationGiuseppe Scrivano
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-05-17systemcontainercustom.conf.j2: use Environment instead of ENVIRONMENTGiuseppe Scrivano
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1451187 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-05-12Merge pull request #4174 from ashcrow/remove-userland-proxyOpenShift Bot
Merged by openshift-bot
2017-05-12Remove userland-proxy-path from daemon.jsonSteve Milner
This flag is currently being set within the system container via the init.sh
2017-05-12Fix whistespace issues in custom templateSteve Milner
2017-05-11Remove unused daemon.json keysSteve Milner
Instead of providing every possible key in the daemon.json configuration file, this update only provides keys which are actively set/used by the installer.
2017-05-11Merge pull request #4158 from ganhuang/lower_boolScott Dodson
lower case in /etc/daemon.json and correct block-registry
2017-05-10Merge pull request #4152 from sdodson/iptables-defaultOpenShift Bot
Merged by openshift-bot
2017-05-11lower case in /etc/daemon.json and correct block-registryGan Huang
2017-05-10Default to iptables on masterScott Dodson
We did this in 3.5 but never on master and we never came back to add migration support. So we'll revert this on master and if/when we add migration support we'll switch the default.
2017-05-10Rename blocked-registries to block-registriesSteve Milner
The daemon.json configuration key is block-registries. The code and installer bits call it blocked-registries.
2017-05-10Ensure true is lowercase in daemon.jsonSteve Milner
2017-05-08Use local variables for daemon.json templateSteve Milner
Instead of using bare lists and dicts this change converts variables into json for use with daemon.json. jinja2 does have an ability to do this in side of templates, however it is only available in 2.9+. Until then the use of ansible's to_json in the playbook is being used. Refs: - http://jinja.pocoo.org/docs/2.9/templates/#tojson - http://docs.ansible.com/ansible/playbooks_filters.html#filters-for-formatting-data
2017-05-05Fix 1448368, and some other minors issuesGan Huang
2017-05-03System container dockerSteve Milner
This change allows for the use of either the traditional package install of docker OR a system container install of docker. Two new inventory options, openshift_docker_use_system_container and openshift_docker_systemcontainer_image_registry_override, have been added which are be used to install with a system container. By default this option is commented out. One new fact has been added: - docker.service_name: docker by default, container-engine-docker for system container
2017-03-07Loosely couple docker to iptables serviceRussell Teague
2016-11-11Resolve docker and iptables service dependenciesRussell Teague
The docker service adds rules to the iptables configuration to support proper network functionality for running containers. If the service is started prior to iptables, these rules are not properly created. * Ensure iptables is started prior to docker Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1390835
generated by cgit v1.2.3 (git 2.39.1) at 2026-08-28 23:47:36 +0000