openshift / openshift-ansible / 9041 / 1

51%

master: 51%

push

travis-ci

Merge pull request #5629 from mgugino-upstream-stage/duplicate-docker-regs

Automatic merge from submit-queue.

Restore registires to /etc/sysconfig/docker

Previously, a commit was added to migrate registires
from /etc/sysconfig/docker to /etc/containers/registries.conf

We are not currently enforcing a minimum version of docker
to consume from this new file, thus some installations
are not utilizing the correct repositories.

This commit duplicates the registires in both locations
to ensure additional/blocked/insecure registries are
honored.

2238 of 5640 branches covered (39.68%)

7304 of 13407 relevant lines covered (54.48%)

0.54 hits per line