diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-04 15:46:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-04 15:46:04 +0000 |
| commit | 6dd2a7d02923e06251af8a0bbd324108b59acac9 (patch) | |
| tree | 08a24f3d5a5fabc38f6cba9d7cb6f95725ee9461 /docker | |
| parent | 8e51c4d993d1351425cd11aba45f33a474079db5 (diff) | |
| parent | 69f980b86dfd09f23aa7e0644b1d1c47338dd4fc (diff) | |
| download | kolla-6dd2a7d02923e06251af8a0bbd324108b59acac9.tar.gz kolla-6dd2a7d02923e06251af8a0bbd324108b59acac9.zip | |
Merge "change the mode for sudoers file"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/grafana/Dockerfile.j2 | 8 | ||||
| -rw-r--r-- | docker/vmtp/Dockerfile.j2 | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/docker/grafana/Dockerfile.j2 b/docker/grafana/Dockerfile.j2 index 7d03bcd49..ba54e144c 100644 --- a/docker/grafana/Dockerfile.j2 +++ b/docker/grafana/Dockerfile.j2 @@ -8,14 +8,16 @@ MAINTAINER {{ maintainer }} {% set grafana_packages = ['grafana'] %} {{ macros.install_packages(grafana_packages | customizable("packages")) }} -RUN usermod -a -G kolla grafana \ - && grafana-cli plugins install sileht-gnocchi-datasource - WORKDIR /usr/share/grafana COPY grafana_sudoers /etc/sudoers.d/kolla_grafana_sudoers COPY extend_start.sh /usr/local/bin/kolla_extend_start +RUN grafana-cli plugins install sileht-gnocchi-datasource \ + && chmod 750 /etc/sudoers.d \ + && chmod 440 /etc/sudoers.d/kolla_grafana_sudoers \ + && usermod -a -G kolla grafana + {% block grafana_footer %}{% endblock %} {% block footer %}{% endblock %} {{ include_footer }} diff --git a/docker/vmtp/Dockerfile.j2 b/docker/vmtp/Dockerfile.j2 index 3bc1cc53e..b75079131 100644 --- a/docker/vmtp/Dockerfile.j2 +++ b/docker/vmtp/Dockerfile.j2 @@ -17,7 +17,7 @@ RUN pip install vmtp \ COPY vmtp_sudoers /etc/sudoers.d/kolla_vmtp_sudoers RUN chmod 750 /etc/sudoers.d \ - && chmod 440 /etc/sudoers.d \ + && chmod 440 /etc/sudoers.d/kolla_vmtp_sudoers \ && usermod -a -G kolla vmtp {% block vmtp_footer %}{% endblock %} |