diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-11-01 03:27:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-01 03:27:08 -0700 |
| commit | 7a6662385496109ea1a43614937a50f2fc2d0f81 (patch) | |
| tree | 94c020a8aba63b41d4eda3430f06aacaf9495154 /roles/docker/tasks/package_docker.yml | |
| parent | d497c5e34d5e85b1c4e1258343fe689413500018 (diff) | |
| parent | abcc49d0ccdbdbaaeb69b5dccf68244f36c66246 (diff) | |
| download | openshift-7a6662385496109ea1a43614937a50f2fc2d0f81.tar.gz openshift-7a6662385496109ea1a43614937a50f2fc2d0f81.tar.bz2 openshift-7a6662385496109ea1a43614937a50f2fc2d0f81.tar.xz openshift-7a6662385496109ea1a43614937a50f2fc2d0f81.zip | |
Merge pull request #5955 from mgugino-upstream-stage/remove-docker-etc-containers-regs
Automatic merge from submit-queue.
Docker: make use of new etc/containers/registries.conf optional
Currently, not all versions of docker support using
/etc/containers/registries.conf
This commit makes the use of that file optional.
Diffstat (limited to 'roles/docker/tasks/package_docker.yml')
| -rw-r--r-- | roles/docker/tasks/package_docker.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/roles/docker/tasks/package_docker.yml b/roles/docker/tasks/package_docker.yml index b16413f72..c1aedf879 100644 --- a/roles/docker/tasks/package_docker.yml +++ b/roles/docker/tasks/package_docker.yml @@ -81,6 +81,7 @@ template: dest: "{{ containers_registries_conf_path }}" src: registries.conf + when: openshift_docker_use_etc_containers | bool notify: - restart docker |