diff options
| author | Zuul <zuul@review.opendev.org> | 2026-06-19 07:26:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2026-06-19 07:26:02 +0000 |
| commit | 9da54ce8874c36a09cbb98081ca550908b980257 (patch) | |
| tree | dd36dda02bc7380b355a3fa51a86b6bd1d13e33e /docker | |
| parent | a437f0bd5f406bf1f82dfdf05c4dac16c02573ff (diff) | |
| parent | 88b659d9886fb04749e2c4e43bb6b0ddbe786576 (diff) | |
| download | kolla-9da54ce8874c36a09cbb98081ca550908b980257.tar.gz kolla-9da54ce8874c36a09cbb98081ca550908b980257.zip | |
Merge "Remove cgi-bin creation in gnocchi and masakari"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/gnocchi/gnocchi-base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/masakari/masakari-base/Dockerfile.j2 | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2 index b4a210a13..a050bce8d 100644 --- a/docker/gnocchi/gnocchi-base/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2 @@ -18,7 +18,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python3-rados', ] %} -RUN mkdir -p /var/www/cgi-bin/gnocchi {% elif base_package_type == 'deb' %} {% set gnocchi_base_packages = [ diff --git a/docker/masakari/masakari-base/Dockerfile.j2 b/docker/masakari/masakari-base/Dockerfile.j2 index 9b5e117bc..7ec23e4e1 100644 --- a/docker/masakari/masakari-base/Dockerfile.j2 +++ b/docker/masakari/masakari-base/Dockerfile.j2 @@ -33,9 +33,8 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN ln -s masakari-base-source/* masakari \ && {{ macros.install_pip(masakari_base_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/masakari /var/www/cgi-bin/masakari \ + && mkdir -p /etc/masakari \ && cp -r /masakari/etc/masakari/* /etc/masakari/ \ - && chmod 755 /var/www/cgi-bin/masakari \ && touch /usr/local/bin/kolla_masakari_extend_start \ && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_masakari_extend_start |