diff options
| author | Zuul <zuul@review.opendev.org> | 2026-07-08 16:33:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2026-07-08 16:33:45 +0000 |
| commit | 44b4d81399792f539716618953f2cafa64086a5c (patch) | |
| tree | 4699d7e068e6dd842a9f1f247ca2f150d60d5e27 /docker/httpd/Dockerfile.j2 | |
| parent | b3803eb9f951acd63018ab8ba69bcbd1a2de5c93 (diff) | |
| parent | db35ac8d793506bc43b62e7e39d27a75de1043ed (diff) | |
| download | kolla-44b4d81399792f539716618953f2cafa64086a5c.tar.gz kolla-44b4d81399792f539716618953f2cafa64086a5c.zip | |
Merge "Migrate to pyproject.toml"
Diffstat (limited to 'docker/httpd/Dockerfile.j2')
| -rw-r--r-- | docker/httpd/Dockerfile.j2 | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/docker/httpd/Dockerfile.j2 b/docker/httpd/Dockerfile.j2 deleted file mode 100644 index ec5637283..000000000 --- a/docker/httpd/Dockerfile.j2 +++ /dev/null @@ -1,42 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" -{% endblock %} - -{% block apache_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% if base_package_type == 'rpm' %} -{{ macros.enable_extra_repos(['epel']) }} - {% set apache_packages = [ - 'httpd', - 'mod_ssl', - 'mod_auth_mellon', - 'mod_auth_openidc', - 'mod_proxy_uwsgi' - ] %} -{% elif base_package_type == 'deb' %} - {% set apache_packages = [ - 'apache2', - 'ca-certificates', - 'libapache2-mod-auth-mellon', - 'libapache2-mod-auth-openidc' - ] %} -{% endif %} - -{{ macros.install_packages(apache_packages | customizable("packages")) }} - -{% if base_package_type == 'rpm' %} -RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ - && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf -{% elif base_package_type == 'deb' %} -RUN echo > /etc/apache2/ports.conf -{% endif %} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start -COPY httpd_setup.sh /usr/local/bin/kolla_httpd_setup -RUN chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_httpd_setup -USER root - -{% block apache_footer %}{% endblock %} |
