9a02633faf
This patch modifies the Dockerfile for both the Ironic API and Inspector so that the 'root' user executes the container setup scripts. This enables the container httpd configuration script to execute. Change-Id: I02b58ac571cd4eb3b9d4a814fe0cb907a3564e23
61 lines
2.1 KiB
Django/Jinja
61 lines
2.1 KiB
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
|
|
{% block labels %}
|
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
|
{% endblock %}
|
|
|
|
{% block ironic_inspector_header %}{% endblock %}
|
|
|
|
{% import "macros.j2" as macros with context %}
|
|
|
|
{{ macros.configure_user(name='ironic-inspector') }}
|
|
|
|
{% if install_type == 'binary' %}
|
|
{% if base_package_type == 'rpm' %}
|
|
{% set ironic_inspector_packages = [
|
|
'openstack-ironic-inspector',
|
|
'openstack-ironic-inspector-dnsmasq'
|
|
] %}
|
|
{% elif base_package_type == 'deb' %}
|
|
{% set ironic_inspector_packages = [
|
|
'iptables',
|
|
'ironic-inspector'
|
|
] %}
|
|
{% endif %}
|
|
|
|
{{ macros.install_packages(ironic_inspector_packages | customizable("packages")) }}
|
|
|
|
{% elif install_type == 'source' %}
|
|
{% if base_package_type == 'deb' %}
|
|
{% set ironic_inspector_packages = ['iptables'] %}
|
|
{% endif %}
|
|
|
|
{{ macros.install_packages(ironic_inspector_packages | customizable("packages")) }}
|
|
|
|
ADD ironic-inspector-archive /ironic-inspector-source
|
|
|
|
{% set ironic_inspector_pip_packages = [
|
|
'/ironic-inspector'
|
|
] %}
|
|
|
|
RUN ln -s ironic-inspector-source/* ironic-inspector \
|
|
&& {{ macros.install_pip(ironic_inspector_pip_packages | customizable("pip_packages")) }} \
|
|
&& mkdir -p /etc/ironic-inspector \
|
|
&& cp /ironic-inspector/rootwrap.conf /etc/ironic-inspector/ \
|
|
&& cp -r /ironic-inspector/rootwrap.d/ /etc/ironic-inspector/ \
|
|
&& sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/ironic-inspector/rootwrap.conf
|
|
|
|
ADD ironic_inspector_sudoers /etc/sudoers.d/kolla_ironic_inspector_sudoers
|
|
RUN chmod 750 /etc/sudoers.d \
|
|
&& chmod 440 /etc/sudoers.d/kolla_ironic_inspector_sudoers
|
|
|
|
{% endif %}
|
|
|
|
COPY extend_start.sh /usr/local/bin/kolla_extend_start
|
|
|
|
RUN chmod 755 /usr/local/bin/kolla_extend_start \
|
|
&& mkdir -p /var/lib/ironic-inspector/dhcp-hostsdir \
|
|
&& chown -R ironic-inspector: /etc/ironic-inspector /var/lib/ironic-inspector
|
|
|
|
{% block ironic_inspector_footer %}{% endblock %}
|
|
{% block footer %}{% endblock %}
|