fec6382d2d
1.Change "ironic_base" to "ironic_inspector" in ironic-inspector Dockerfile
2.add {% block footer %}{% endblock %}
TrivialFix
Closes-Bug: #1625131
Change-Id: Ibd02676e91a9b00cb1a46e7d00eaa3ab2c6c6412
27 lines
875 B
Django/Jinja
27 lines
875 B
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }}
|
|
MAINTAINER {{ maintainer }}
|
|
|
|
{% block ironic_inspector_header %}{% endblock %}
|
|
|
|
{% import "macros.j2" as macros with context %}
|
|
|
|
{% if install_type == 'binary' %}
|
|
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
|
|
{% set ironic_inspector_packages = ['openstack-ironic-inspector'] %}
|
|
{% elif base_distro in ['ubuntu'] %}
|
|
{% set ironic_inspector_packages = ['ironic-inspector'] %}
|
|
{% endif %}
|
|
|
|
{{ macros.install_packages(ironic_inspector_packages | customizable("packages")) }}
|
|
|
|
{% elif install_type == 'source' %}
|
|
RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt \
|
|
ironic-inspector
|
|
{% endif %}
|
|
|
|
{% block ironic_inspector_footer %}{% endblock %}
|
|
{% block footer %}{% endblock %}
|
|
{{ include_footer }}
|
|
|
|
USER ironic
|