diff options
| author | Zuul <zuul@review.openstack.org> | 2018-10-04 15:57:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-10-04 15:57:37 +0000 |
| commit | 5c2fa32e63d86ed51ac668b5958f967b055b0f18 (patch) | |
| tree | e7049c87f91a562ac902e8ad307d8897a6fd3c97 /docker | |
| parent | beda1a8410811aa982b29d40e6a1eecd96ee16e5 (diff) | |
| parent | 0c8d3f0586a5bbd797ee38786b58d004091dd104 (diff) | |
| download | kolla-5c2fa32e63d86ed51ac668b5958f967b055b0f18.tar.gz kolla-5c2fa32e63d86ed51ac668b5958f967b055b0f18.zip | |
Merge "Add user 'zun' to group 'docker'"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/zun/zun-compute/Dockerfile.j2 | 7 | ||||
| -rw-r--r-- | docker/zun/zun-compute/extend_start.sh | 5 | ||||
| -rw-r--r-- | docker/zun/zun-compute/zun_sudoers | 3 |
3 files changed, 15 insertions, 0 deletions
diff --git a/docker/zun/zun-compute/Dockerfile.j2 b/docker/zun/zun-compute/Dockerfile.j2 index 23ab689f7..33061893b 100644 --- a/docker/zun/zun-compute/Dockerfile.j2 +++ b/docker/zun/zun-compute/Dockerfile.j2 @@ -10,6 +10,13 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% endif %} +COPY zun_sudoers /etc/sudoers.d/kolla_zun_sudoers +COPY extend_start.sh /usr/local/bin/kolla_zun_extend_start + +RUN chmod 755 /usr/local/bin/kolla_zun_extend_start \ + && chmod 750 /etc/sudoers.d \ + && chmod 640 /etc/sudoers.d/kolla_zun_sudoers + {% block zun_compute_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/zun/zun-compute/extend_start.sh b/docker/zun/zun-compute/extend_start.sh new file mode 100644 index 000000000..f3b6fc48b --- /dev/null +++ b/docker/zun/zun-compute/extend_start.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +gid=$(stat -c "%g" /var/run/docker.sock) +sudo groupadd --force --gid $gid docker +sudo usermod -aG docker zun diff --git a/docker/zun/zun-compute/zun_sudoers b/docker/zun/zun-compute/zun_sudoers new file mode 100644 index 000000000..b3a39af7d --- /dev/null +++ b/docker/zun/zun-compute/zun_sudoers @@ -0,0 +1,3 @@ +zun ALL=(root) NOPASSWD: /var/lib/kolla/venv/bin/zun-rootwrap /etc/zun/rootwrap.conf * +zun ALL=(root) NOPASSWD: /usr/sbin/groupadd --force --gid * +zun ALL=(root) NOPASSWD: /usr/sbin/usermod -aG docker zun |