diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-03 03:42:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-03 03:42:52 -0700 |
| commit | 05da1077f81f9579a6d15fd6287dd77cfa494c7a (patch) | |
| tree | c6065a7ab88947c25a0d0fb318997036b4d198d7 /docs/proposals/playbook_consolidation.md | |
| parent | 57675931e03a488fdd66ba5c45b93e207e2d84eb (diff) | |
| parent | f22f8f0fb1c3f4be757b007606c2427538cee864 (diff) | |
| download | openshift-05da1077f81f9579a6d15fd6287dd77cfa494c7a.tar.gz openshift-05da1077f81f9579a6d15fd6287dd77cfa494c7a.tar.bz2 openshift-05da1077f81f9579a6d15fd6287dd77cfa494c7a.tar.xz openshift-05da1077f81f9579a6d15fd6287dd77cfa494c7a.zip | |
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.
Diffstat (limited to 'docs/proposals/playbook_consolidation.md')
0 files changed, 0 insertions, 0 deletions