diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-25 11:17:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-25 11:17:16 -0700 |
| commit | 4ceb4bd931fa48b1f666d2258fff763b29bffba8 (patch) | |
| tree | 065ebb428f85565dea0ecb4efe078fe1fef3e530 /roles/openshift_node | |
| parent | 33ac861412ab745b0cd36cc42735b92953737661 (diff) | |
| parent | b35272a794a572f60034293dd8cb7f057cf3fc8c (diff) | |
| download | openshift-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/openshift_node')
| -rw-r--r-- | roles/openshift_node/templates/openshift.docker.node.dep.service | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_node/templates/openshift.docker.node.dep.service b/roles/openshift_node/templates/openshift.docker.node.dep.service index 8734e7443..fa7238849 100644 --- a/roles/openshift_node/templates/openshift.docker.node.dep.service +++ b/roles/openshift_node/templates/openshift.docker.node.dep.service @@ -6,6 +6,6 @@ Before={{ openshift.common.service_type }}-node.service {% if openshift_use_crio|default(false) %}Wants=cri-o.service{% endif %} [Service] -ExecStart=/bin/bash -c "if [[ -f /usr/bin/docker-current ]]; then echo \"DOCKER_ADDTL_BIND_MOUNTS=--volume=/usr/bin/docker-current:/usr/bin/docker-current:ro --volume=/etc/sysconfig/docker:/etc/sysconfig/docker:ro\" > /etc/sysconfig/{{ openshift.common.service_type }}-node-dep; else echo \"#DOCKER_ADDTL_BIND_MOUNTS=\" > /etc/sysconfig/{{ openshift.common.service_type }}-node-dep; fi" +ExecStart=/bin/bash -c "if [[ -f /usr/bin/docker-current ]]; then echo \"DOCKER_ADDTL_BIND_MOUNTS=--volume=/usr/bin/docker-current:/usr/bin/docker-current:ro --volume=/etc/sysconfig/docker:/etc/sysconfig/docker:ro --volume=/etc/containers/registries:/etc/containers/registries:ro\" > /etc/sysconfig/{{ openshift.common.service_type }}-node-dep; else echo \"#DOCKER_ADDTL_BIND_MOUNTS=\" > /etc/sysconfig/{{ openshift.common.service_type }}-node-dep; fi" ExecStop= SyslogIdentifier={{ openshift.common.service_type }}-node-dep |