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/aodh | |
| parent | 8650c57c12498c483445536af5b5a85ada87791e (diff) | |
| parent | e21aeb5ae955671937055baf57836120af8d4312 (diff) | |
| download | kolla-7cb4f7d01c5e61ebd5f324822e41910564d5563f.tar.gz kolla-7cb4f7d01c5e61ebd5f324822e41910564d5563f.zip | |
Merge "flatten images a bit"
Diffstat (limited to 'docker/aodh')
| -rw-r--r-- | docker/aodh/aodh-base/Dockerfile.j2 | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/docker/aodh/aodh-base/Dockerfile.j2 b/docker/aodh/aodh-base/Dockerfile.j2 index 2712ed721..142b8bcf9 100644 --- a/docker/aodh/aodh-base/Dockerfile.j2 +++ b/docker/aodh/aodh-base/Dockerfile.j2 @@ -21,16 +21,15 @@ ADD aodh-base-archive /aodh-base-source '/aodh', ] %} +COPY extend_start.sh /usr/local/bin/kolla_extend_start +COPY aodh_sudoers /etc/sudoers.d/kolla_aodh_sudoers + RUN ln -s aodh-base-source/* aodh \ && {{ macros.install_pip(aodh_base_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/aodh /var/www/cgi-bin/aodh \ && cp /aodh/aodh/api/app.wsgi /var/www/cgi-bin/aodh \ - && chown -R aodh: /etc/aodh /var/www/cgi-bin/aodh - -COPY extend_start.sh /usr/local/bin/kolla_extend_start -COPY aodh_sudoers /etc/sudoers.d/kolla_aodh_sudoers - -RUN chmod 750 /etc/sudoers.d \ + && chown -R aodh: /etc/aodh /var/www/cgi-bin/aodh \ + && chmod 750 /etc/sudoers.d \ && chmod 640 /etc/sudoers.d/kolla_aodh_sudoers \ && chmod 755 /var/www/cgi-bin/aodh \ && touch /usr/local/bin/kolla_aodh_extend_start \ |