| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #5932 from mgugino-upstream-stage/retry-docker-creds | OpenShift Merge Robot | 2017-10-31 | 1 | -0/+4 |
|\ |
|
| * | Add retry logic to docker auth credentials | Michael Gugino | 2017-10-30 | 1 | -0/+4 |
* | | Merge pull request #5917 from ashcrow/kennys-patch | Scott Dodson | 2017-10-30 | 3 | -5/+8 |
|\ \
| |/
|/| |
|
| * | docker: Create openshift_docker_is_node_or_master variable | Steve Milner | 2017-10-27 | 3 | -5/+8 |
* | | cri-o: Set max log size to 50 mb | Mrunal Patel | 2017-10-27 | 1 | -1/+1 |
|/ |
|
* | Merge pull request #5911 from giuseppe/crio-open-port-10010 | Scott Dodson | 2017-10-27 | 4 | -0/+53 |
|\ |
|
| * | cri-o: open port 10010 | Giuseppe Scrivano | 2017-10-27 | 4 | -0/+53 |
* | | Merge pull request #5901 from ashcrow/failed-when | Scott Dodson | 2017-10-27 | 1 | -1/+1 |
|\ \ |
|
| * | | crio: Add failed_when to overlay check | Steve Milner | 2017-10-26 | 1 | -1/+1 |
| |/ |
|
| * | Merge pull request #5814 from mgugino-upstream-stage/docker-auth-upgrades | OpenShift Merge Robot | 2017-10-24 | 2 | -11/+13 |
| |\ |
|
| | * | Enable oreg_auth credential replace during upgrades | Michael Gugino | 2017-10-19 | 2 | -11/+13 |
* | | | Merge pull request #5905 from ashcrow/restorcon-for-crio | Scott Dodson | 2017-10-27 | 1 | -0/+4 |
|\ \ \ |
|
| * | | | crio: restorcon /var/lib/containers | Steve Milner | 2017-10-26 | 1 | -0/+4 |
| |/ / |
|
* / / | docker: set credentials when using system container | Giuseppe Scrivano | 2017-10-26 | 3 | -11/+15 |
|/ / |
|
* | | Merge pull request #5818 from ashcrow/1503860 | OpenShift Merge Robot | 2017-10-23 | 2 | -8/+9 |
|\ \ |
|
| * | | docker: Move enterprise registry from pkg to main | Steve Milner | 2017-10-19 | 2 | -8/+9 |
| |/ |
|
* / | systemcontainers: Verify atomic.conf proxy is always configured | Steve Milner | 2017-10-19 | 2 | -62/+8 |
|/ |
|
* | Merge pull request #5774 from mgugino-upstream-stage/docker-option-fix | Scott Dodson | 2017-10-18 | 2 | -5/+7 |
|\ |
|
| * | Fix missing docker option signature-verification | Michael Gugino | 2017-10-16 | 2 | -5/+7 |
* | | cri-o: error out when node is a Docker container | Giuseppe Scrivano | 2017-10-16 | 1 | -0/+6 |
|/ |
|
* | Ensure docker service status actually changes | Michael Gugino | 2017-10-11 | 1 | -1/+8 |
* | crio, docker: expect openshift_release to have 'v' | Giuseppe Scrivano | 2017-10-10 | 2 | -2/+2 |
* | Merge pull request #5695 from giuseppe/image_tag_default_to_release | OpenShift Merge Robot | 2017-10-09 | 3 | -13/+35 |
|\ |
|
| * | crio, docker: use openshift_release when openshift_image_tag is not used | Giuseppe Scrivano | 2017-10-09 | 3 | -12/+34 |
| * | crio: fix typo | Giuseppe Scrivano | 2017-10-09 | 1 | -1/+1 |
* | | Merge pull request #5705 from mgugino-upstream-stage/docker-partof-iptables | Scott Dodson | 2017-10-09 | 1 | -0/+6 |
|\ \ |
|
| * | | Add PartOf to docker systemd service unit. | Michael Gugino | 2017-10-09 | 1 | -0/+6 |
| |/ |
|
* / | crio: use systemd manager | Giuseppe Scrivano | 2017-10-09 | 1 | -1/+1 |
|/ |
|
* | Merge pull request #5661 from giuseppe/crio-use-overlay-instead-of-overlay2 | OpenShift Merge Robot | 2017-10-07 | 1 | -3/+25 |
|\ |
|
| * | crio.conf.j2: sync from upstream | Giuseppe Scrivano | 2017-10-06 | 1 | -1/+23 |
| * | cri-o: use overlay instead of overlay2 | Giuseppe Scrivano | 2017-10-06 | 1 | -2/+2 |
* | | Ensure docker is restarted when iptables is restarted | Michael Gugino | 2017-10-06 | 2 | -1/+4 |
|/ |
|
* | Ensure docker service started prior to credentials | Michael Gugino | 2017-10-03 | 1 | -12/+12 |
* | Merge pull request #5490 from giuseppe/set-crio-docker-tag-for-ose | OpenShift Merge Robot | 2017-10-03 | 3 | -9/+35 |
|\ |
|
| * | docker: fix some tox warnings | Giuseppe Scrivano | 2017-09-27 | 1 | -6/+6 |
| * | Require openshift_image_tag in the inventory with openshift-enterprise | Giuseppe Scrivano | 2017-09-27 | 1 | -0/+8 |
| * | crio: use the image_tag on RHEL | Giuseppe Scrivano | 2017-09-27 | 1 | -2/+11 |
| * | docker: use the image_tag on RHEL | Giuseppe Scrivano | 2017-09-27 | 1 | -1/+10 |
* | | Restore registires to /etc/sysconfig/docker | Michael Gugino | 2017-10-02 | 1 | -2/+12 |
* | | Fix typo in files (Docker registries) | William Burton | 2017-09-29 | 2 | -2/+2 |
* | | Migrate enterprise registry logic to docker role | Michael Gugino | 2017-09-27 | 4 | -9/+19 |
|/ |
|
* | Merge pull request #5519 from giuseppe/crio-set-proper-tag | OpenShift Merge Robot | 2017-09-26 | 1 | -1/+1 |
|\ |
|
| * | crio: set the correct image name with OSE | Giuseppe Scrivano | 2017-09-25 | 1 | -1/+1 |
* | | Merge pull request #5205 from mgugino-upstream-stage/docker-etc-containers-regs | OpenShift Merge Robot | 2017-09-25 | 3 | -9/+69 |
|\ \
| |/
|/| |
|
| * | Move additional/block/insecure registires to /etc/containers/registries.conf | Michael Gugino | 2017-09-21 | 3 | -9/+69 |
* | | Merge pull request #5501 from giuseppe/crio-skip-nfs-and-lb | OpenShift Merge Robot | 2017-09-24 | 1 | -0/+1 |
|\ \ |
|
| * | | crio: skip installation on lbs and nfs nodes | Giuseppe Scrivano | 2017-09-22 | 1 | -0/+1 |
* | | | Merge pull request #5354 from ashcrow/crio-systemcontainer-image-override | OpenShift Merge Robot | 2017-09-22 | 1 | -8/+12 |
|\ \ \ |
|
| * | | | cri-o: Allow full image override | Steve Milner | 2017-09-12 | 1 | -8/+12 |
* | | | | Merge pull request #5477 from mgugino-upstream-stage/hot-fix-oreg_url | OpenShift Merge Robot | 2017-09-21 | 1 | -2/+2 |
|\ \ \ \
| |_|/ /
|/| | | |
|