openshift / openshift-ansible / 9041

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.

2305 of 5810 branches covered (39.67%)

7347 of 13407 relevant lines covered (54.8%)

1.09 hits per line