summaryrefslogtreecommitdiffstats
path: root/roles/docker/vars
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-09-25 11:17:16 -0700
committerGitHub <noreply@github.com>2017-09-25 11:17:16 -0700
commit4ceb4bd931fa48b1f666d2258fff763b29bffba8 (patch)
tree065ebb428f85565dea0ecb4efe078fe1fef3e530 /roles/docker/vars
parent33ac861412ab745b0cd36cc42735b92953737661 (diff)
parentb35272a794a572f60034293dd8cb7f057cf3fc8c (diff)
downloadopenshift-4ceb4bd931fa48b1f666d2258fff763b29bffba8.tar.gz
openshift-4ceb4bd931fa48b1f666d2258fff763b29bffba8.tar.bz2
openshift-4ceb4bd931fa48b1f666d2258fff763b29bffba8.tar.xz
openshift-4ceb4bd931fa48b1f666d2258fff763b29bffba8.zip
Merge pull request #5205 from mgugino-upstream-stage/docker-etc-containers-regs
Automatic merge from submit-queue Move additional/block/insecure registires to /etc/containers/... Move additional/block/insecure registires to /etc/containers/registries.conf This commit moves additional/block/insecure registries to /etc/containers/registries.conf and comments existing lines in /etc/sysconfig/docker. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1460930
Diffstat (limited to 'roles/docker/vars')
0 files changed, 0 insertions, 0 deletions