diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-02 21:42:50 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-02 21:42:50 -0800 |
| commit | 19d1642c26d99f9059b70222a157532f539dcaa8 (patch) | |
| tree | 0c0bdb423831232a107cacd3cc20c05b3ddfb20a | |
| parent | 893e89975afc9d4221cff409698ca632dd825977 (diff) | |
| parent | b6cfba63633a10446f8d08af988648af5e997341 (diff) | |
| download | openshift-19d1642c26d99f9059b70222a157532f539dcaa8.tar.gz openshift-19d1642c26d99f9059b70222a157532f539dcaa8.tar.bz2 openshift-19d1642c26d99f9059b70222a157532f539dcaa8.tar.xz openshift-19d1642c26d99f9059b70222a157532f539dcaa8.zip | |
Merge pull request #6581 from mgugino-upstream-stage/fix-syscontainer-reg-auth
Automatic merge from submit-queue.
Add docker auth credentials to system container install
This commit adds docker auth credentials mount to
system container systemd unit file.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1514324
| -rw-r--r-- | roles/openshift_node/templates/openshift.docker.node.dep.service | 8 |
1 files changed, 7 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 8b43beb07..873744f34 100644 --- a/roles/openshift_node/templates/openshift.docker.node.dep.service +++ b/roles/openshift_node/templates/openshift.docker.node.dep.service @@ -6,6 +6,12 @@ Before={{ openshift_service_type }}-node.service {% if openshift_use_crio %}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 --volume=/etc/containers/registries:/etc/containers/registries:ro\" > /etc/sysconfig/{{ openshift_service_type }}-node-dep; else echo \"#DOCKER_ADDTL_BIND_MOUNTS=\" > /etc/sysconfig/{{ openshift_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 \ + {% if l_bind_docker_reg_auth %} --volume={{ oreg_auth_credentials_path }}:/root/.docker:ro{% endif %}\" > \ + /etc/sysconfig/{{ openshift_service_type }}-node-dep; \ + else echo "#DOCKER_ADDTL_BIND_MOUNTS=" > /etc/sysconfig/{{ openshift_service_type }}-node-dep; fi' ExecStop= SyslogIdentifier={{ openshift_service_type }}-node-dep |