diff options
| author | Zuul <zuul@review.opendev.org> | 2022-04-22 08:46:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-04-22 08:46:55 +0000 |
| commit | 7cb4f7d01c5e61ebd5f324822e41910564d5563f (patch) | |
| tree | 0991b7f2611dee2380df9cbe203df436f07c4be2 /docker/gnocchi | |
| parent | 8650c57c12498c483445536af5b5a85ada87791e (diff) | |
| parent | e21aeb5ae955671937055baf57836120af8d4312 (diff) | |
| download | kolla-7cb4f7d01c5e61ebd5f324822e41910564d5563f.tar.gz kolla-7cb4f7d01c5e61ebd5f324822e41910564d5563f.zip | |
Merge "flatten images a bit"
Diffstat (limited to 'docker/gnocchi')
| -rw-r--r-- | docker/gnocchi/gnocchi-base/Dockerfile.j2 | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2 index 4a12b97bf..9fb808dfc 100644 --- a/docker/gnocchi/gnocchi-base/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2 @@ -38,15 +38,14 @@ ADD gnocchi-base-archive /gnocchi-base-source '/gnocchi[keystone,mysql,file,ceph,s3]' ] %} -RUN ln -s gnocchi-base-source/* gnocchi \ - && {{ macros.install_pip(gnocchi_base_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/gnocchi \ - && chown -R gnocchi: /etc/gnocchi - COPY extend_start.sh /usr/local/bin/kolla_extend_start COPY gnocchi_sudoers /etc/sudoers.d/kolla_gnocchi_sudoers -RUN chmod 750 /etc/sudoers.d \ +RUN ln -s gnocchi-base-source/* gnocchi \ + && {{ macros.install_pip(gnocchi_base_pip_packages | customizable("pip_packages")) }} \ + && mkdir -p /etc/gnocchi \ + && chown -R gnocchi: /etc/gnocchi \ + && chmod 750 /etc/sudoers.d \ && chmod 640 /etc/sudoers.d/kolla_gnocchi_sudoers \ && touch /usr/local/bin/kolla_gnocchi_extend_start \ && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_gnocchi_extend_start |