Add httpd image for OIDC/SAML frontend in uWSGI case

Change-Id: Ia85f253ecaeaef63c17e75dc4a223e030dbbc58d
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
This commit is contained in:
Michal Nasiadka
2025-07-11 11:56:54 +02:00
parent 7aef10849b
commit 8f827e021b
2 changed files with 46 additions and 0 deletions

View File

@@ -0,0 +1,45 @@
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
{% endblock %}
{% block apache_header %}{% endblock %}
{% import "macros.j2" as macros with context %}
{% if base_package_type == 'rpm' %}
{# NOTE(mnasiadka): mod_auth_mellon missing in CentOS 10 Stream - temporarily from Kolla COPR #}
{{ macros.enable_extra_repos(['epel', 'kolla_el10']) }}
{% 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',
'libapache2-mod-proxy-uwsgi'
] %}
{% 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
RUN chmod 644 /usr/local/bin/kolla_extend_start
USER root
{% block apache_footer %}{% endblock %}

View File

@@ -0,0 +1 @@
. /usr/local/bin/kolla_httpd_setup