summaryrefslogtreecommitdiffstats
path: root/roles/docker
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5818 from ashcrow/1503860OpenShift Merge Robot2017-10-232-8/+9
|\
| * docker: Move enterprise registry from pkg to mainSteve Milner2017-10-192-8/+9
* | systemcontainers: Verify atomic.conf proxy is always configuredSteve Milner2017-10-192-62/+8
|/
* Merge pull request #5774 from mgugino-upstream-stage/docker-option-fixScott Dodson2017-10-182-5/+7
|\
| * Fix missing docker option signature-verificationMichael Gugino2017-10-162-5/+7
* | cri-o: error out when node is a Docker containerGiuseppe Scrivano2017-10-161-0/+6
|/
* Ensure docker service status actually changesMichael Gugino2017-10-111-1/+8
* crio, docker: expect openshift_release to have 'v'Giuseppe Scrivano2017-10-102-2/+2
* Merge pull request #5695 from giuseppe/image_tag_default_to_releaseOpenShift Merge Robot2017-10-093-13/+35
|\
| * crio, docker: use openshift_release when openshift_image_tag is not usedGiuseppe Scrivano2017-10-093-12/+34
| * crio: fix typoGiuseppe Scrivano2017-10-091-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
|/
* Merge pull request #5661 from giuseppe/crio-use-overlay-instead-of-overlay2OpenShift Merge Robot2017-10-071-3/+25
|\
| * crio.conf.j2: sync from upstreamGiuseppe Scrivano2017-10-061-1/+23
| * cri-o: use overlay instead of overlay2Giuseppe Scrivano2017-10-061-2/+2
* | Ensure docker is restarted when iptables is restartedMichael Gugino2017-10-062-1/+4
|/
* Ensure docker service started prior to credentialsMichael Gugino2017-10-031-12/+12
* Merge pull request #5490 from giuseppe/set-crio-docker-tag-for-oseOpenShift Merge Robot2017-10-033-9/+35
|\
| * docker: fix some tox warningsGiuseppe Scrivano2017-09-271-6/+6
| * Require openshift_image_tag in the inventory with openshift-enterpriseGiuseppe Scrivano2017-09-271-0/+8
| * crio: use the image_tag on RHELGiuseppe Scrivano2017-09-271-2/+11
| * docker: use the image_tag on RHELGiuseppe Scrivano2017-09-271-1/+10
* | Restore registires to /etc/sysconfig/dockerMichael Gugino2017-10-021-2/+12
* | Fix typo in files (Docker registries)William Burton2017-09-292-2/+2
* | Migrate enterprise registry logic to docker roleMichael Gugino2017-09-274-9/+19
|/
* Merge pull request #5519 from giuseppe/crio-set-proper-tagOpenShift Merge Robot2017-09-261-1/+1
|\
| * crio: set the correct image name with OSEGiuseppe Scrivano2017-09-251-1/+1
* | Merge pull request #5205 from mgugino-upstream-stage/docker-etc-containers-regsOpenShift Merge Robot2017-09-253-9/+69
|\ \ | |/ |/|
| * Move additional/block/insecure registires to /etc/containers/registries.confMichael Gugino2017-09-213-9/+69
* | Merge pull request #5501 from giuseppe/crio-skip-nfs-and-lbOpenShift Merge Robot2017-09-241-0/+1
|\ \
| * | crio: skip installation on lbs and nfs nodesGiuseppe Scrivano2017-09-221-0/+1
* | | Merge pull request #5354 from ashcrow/crio-systemcontainer-image-overrideOpenShift Merge Robot2017-09-221-8/+12
|\ \ \
| * | | cri-o: Allow full image overrideSteve Milner2017-09-121-8/+12
* | | | Merge pull request #5477 from mgugino-upstream-stage/hot-fix-oreg_urlOpenShift Merge Robot2017-09-211-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove default value for oreg_urlMichael Gugino2017-09-201-2/+2
| | |/ | |/|
* / | crio: ensure no default CNI configuration files are leftGiuseppe Scrivano2017-09-201-0/+8
|/ /
* | more retries on repoquery_cmdLuke Meyer2017-09-191-1/+1
* | Merge pull request #5401 from sosiouxme/20170913-retries-subsetLuke Meyer2017-09-141-0/+2
|\ \
| * | add retry on repoquery_cmdLuke Meyer2017-09-131-0/+2
| |/
* | Merge pull request #5359 from mgugino-upstream-stage/version-docker-auth-configOpenShift Bot2017-09-132-0/+17
|\ \
| * | Fix: authenticated registry support for containerized hostsMichael Gugino2017-09-112-0/+17
* | | cri-o: Fix Fedora image nameSteve Milner2017-09-131-1/+1
| |/ |/|
* | container-engine: Allow full image overrideSteve Milner2017-09-111-8/+12
|/
* Merge pull request #5310 from ashcrow/split-rhel-centos-crioOpenShift Bot2017-09-071-2/+8
|\
| * cri-o: Split RHEL and CentOS imagesSteve Milner2017-09-061-2/+8
* | Merge pull request #5202 from giuseppe/crio-additional-registriesOpenShift Bot2017-09-062-0/+14
|\ \ | |/ |/|
| * cri-o: add support for additional registriesGiuseppe Scrivano2017-08-242-0/+14
* | roles: use openshift_use_crioGiuseppe Scrivano2017-08-251-2/+2