diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-20 18:53:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-20 18:53:20 +0000 |
| commit | 94d0d058ed6161d9166592540eebbd9a168e53c0 (patch) | |
| tree | 17b5546afb50df3fc720c56335844e7f36335240 /docker | |
| parent | 113f3cd1f5d4d05debf399e568e1d944dde84446 (diff) | |
| parent | eb2a648b70570a2fcd2b6419ad3d6192633c9495 (diff) | |
| download | kolla-94d0d058ed6161d9166592540eebbd9a168e53c0.tar.gz kolla-94d0d058ed6161d9166592540eebbd9a168e53c0.zip | |
Merge "Fix manila-base dockerfile format"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/manila/manila-base/Dockerfile.j2 | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/docker/manila/manila-base/Dockerfile.j2 b/docker/manila/manila-base/Dockerfile.j2 index aad817c9e..223173262 100644 --- a/docker/manila/manila-base/Dockerfile.j2 +++ b/docker/manila/manila-base/Dockerfile.j2 @@ -47,15 +47,14 @@ RUN ln -s manila-base-source/* manila \ && chown -R manila: /etc/manila /var/cache/manila \ && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/manila/rootwrap.conf -COPY manila_sudoers /etc/sudoers.d/kolla_manila_sudoers -RUN chmod 750 /etc/sudoers.d \ - && chmod 440 /etc/sudoers.d/kolla_manila_sudoers - {% endif %} COPY extend_start.sh /usr/local/bin/kolla_extend_start +COPY manila_sudoers /etc/sudoers.d/kolla_manila_sudoers -RUN touch /usr/local/bin/kolla_manila_extend_start \ +RUN chmod 750 /etc/sudoers.d \ + && chmod 440 /etc/sudoers.d/kolla_manila_sudoers \ + && touch /usr/local/bin/kolla_manila_extend_start \ && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_manila_extend_start {% block manila_base_footer %}{% endblock %} |