6319bc6f55
This is a follow-up on "Refactor httpd install to base image" [1]. It seems a copy-paste algorithm was used to craft Dockerfiles for some httpd-enabled services which resulted in an abundance of ldappool packages getting installed, even in the 'source' case. This seems to have also kept ldappool at a lower version because it did not get updated via pip later. This patch deals with that and also moves ldap deps for Keystone to their proper place in 'source' case (extras). Note Keystone client gets installed in openstack-base. Cinder does not need to include Keystone either. [1] https://review.opendev.org/744037 Change-Id: I017d7a6a5d2b1ae6c04556dcf172453a36de5be7
56 lines
1.6 KiB
Django/Jinja
56 lines
1.6 KiB
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
|
|
{% block labels %}
|
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
|
{% endblock %}
|
|
|
|
{% block masakari_base_header %}{% endblock %}
|
|
|
|
{% import "macros.j2" as macros with context %}
|
|
|
|
{{ macros.configure_user(name='masakari') }}
|
|
|
|
{% if install_type == 'binary' %}
|
|
|
|
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
|
|
&& /bin/false
|
|
|
|
{% elif install_type == 'source' %}
|
|
|
|
{% if base_package_type == 'rpm' %}
|
|
|
|
{% set masakari_base_packages = [
|
|
] %}
|
|
|
|
{{ macros.install_packages(masakari_base_packages | customizable("packages")) }}
|
|
RUN mkdir -p /var/www/cgi-bin/masakari
|
|
{% elif base_package_type == 'deb' %}
|
|
|
|
{% set masakari_base_packages = [
|
|
] %}
|
|
|
|
{{ macros.install_packages(masakari_base_packages | customizable("packages")) }}
|
|
RUN mkdir -p /var/www/cgi-bin/masakari
|
|
{% endif %}
|
|
|
|
ADD masakari-base-archive /masakari-base-source
|
|
|
|
{% set masakari_base_pip_packages = [
|
|
'/masakari'
|
|
] %}
|
|
|
|
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 \
|
|
&& cp -r /masakari/etc/masakari/* /etc/masakari/ \
|
|
&& chown -R masakari: /etc/masakari /var/www/cgi-bin/masakari
|
|
|
|
{% endif %}
|
|
|
|
COPY extend_start.sh /usr/local/bin/kolla_extend_start
|
|
|
|
RUN touch /usr/local/bin/kolla_masakari_extend_start \
|
|
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_masakari_extend_start \
|
|
&& chmod 755 /var/www/cgi-bin/masakari
|
|
|
|
{% block masakari_base_footer %}{% endblock %}
|