summaryrefslogtreecommitdiffstats
path: root/roles/docker
Commit message (Expand)AuthorAgeFilesLines
* Fixing islnk.Kenny Woodson2017-11-131-1/+1
* Merge pull request #6030 from giuseppe/fix-selinux-docker-tooOpenShift Merge Robot2017-11-062-4/+9
|\
| * container-engine: ensure /var/lib/containers/ is properly labelledGiuseppe Scrivano2017-11-062-4/+9
* | Moving docker location to share path with system containers.Kenny Woodson2017-11-062-0/+48
|/
* Docker: make use of new etc/containers/registries.conf optionalMichael Gugino2017-10-312-0/+2
* Merge pull request #5932 from mgugino-upstream-stage/retry-docker-credsOpenShift Merge Robot2017-10-311-0/+4
|\
| * Add retry logic to docker auth credentialsMichael Gugino2017-10-301-0/+4
* | Merge pull request #5917 from ashcrow/kennys-patchScott Dodson2017-10-303-5/+8
|\ \ | |/ |/|
| * docker: Create openshift_docker_is_node_or_master variableSteve Milner2017-10-273-5/+8
* | cri-o: Set max log size to 50 mbMrunal Patel2017-10-271-1/+1
|/
* Merge pull request #5911 from giuseppe/crio-open-port-10010Scott Dodson2017-10-274-0/+53
|\
| * cri-o: open port 10010Giuseppe Scrivano2017-10-274-0/+53
* | Merge pull request #5901 from ashcrow/failed-whenScott Dodson2017-10-271-1/+1
|\ \
| * | crio: Add failed_when to overlay checkSteve Milner2017-10-261-1/+1
| |/
| * Merge pull request #5814 from mgugino-upstream-stage/docker-auth-upgradesOpenShift Merge Robot2017-10-242-11/+13
| |\
| | * Enable oreg_auth credential replace during upgradesMichael Gugino2017-10-192-11/+13
* | | Merge pull request #5905 from ashcrow/restorcon-for-crioScott Dodson2017-10-271-0/+4
|\ \ \
| * | | crio: restorcon /var/lib/containersSteve Milner2017-10-261-0/+4
| |/ /
* / / docker: set credentials when using system containerGiuseppe Scrivano2017-10-263-11/+15
|/ /
* | 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