ae1322ec10
This change updates the docker files to use base_package_type instead of doing specific distro checks for the rhel/deb generic cases. The base_distro is still available and is used when a specific distro needs a customization but if the differences are purely rpm vs deb, then the base_package_type can be used. Change-Id: I8d720bb185df65a0178061ccf20b1ab2265da2c5
52 lines
1.8 KiB
Django/Jinja
52 lines
1.8 KiB
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
|
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
|
|
|
{% block sahara_base_header %}{% endblock %}
|
|
|
|
{% import "macros.j2" as macros with context %}
|
|
|
|
{{ macros.configure_user(name='sahara') }}
|
|
|
|
{% if install_type == 'binary' %}
|
|
|
|
{% if base_package_type == 'rpm' %}
|
|
{% set sahara_base_packages = ['openstack-sahara-common'] %}
|
|
{% elif base_package_type == 'deb' %}
|
|
{% set sahara_base_packages = ['sahara-common'] %}
|
|
{% endif %}
|
|
{{ macros.install_packages(sahara_base_packages | customizable("packages")) }}
|
|
|
|
{% elif install_type == 'source' %}
|
|
|
|
{% if base_package_type == 'rpm' %}
|
|
{% set sahara_base_packages = ['openssh'] %}
|
|
{% elif base_package_type == 'deb' %}
|
|
{% set sahara_base_packages = ['openssh-client'] %}
|
|
{% endif %}
|
|
{{ macros.install_packages(sahara_base_packages | customizable("packages")) }}
|
|
|
|
ADD sahara-base-archive /sahara-base-source
|
|
|
|
{% set sahara_base_pip_packages = [
|
|
'/sahara'
|
|
] %}
|
|
|
|
RUN ln -s sahara-base-source/* sahara \
|
|
&& {{ macros.install_pip(sahara_base_pip_packages | customizable("pip_packages")) }} \
|
|
&& mkdir -p /etc/sahara \
|
|
&& cp -r /sahara/etc/sahara/* /etc/sahara/ \
|
|
&& chown -R sahara: /etc/sahara \
|
|
&& 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/sahara/rootwrap.conf
|
|
|
|
{% endif %}
|
|
|
|
COPY sahara_sudoers /etc/sudoers.d/kolla_sahara_sudoers
|
|
COPY extend_start.sh /usr/local/bin/kolla_extend_start
|
|
|
|
RUN chmod 750 /etc/sudoers.d \
|
|
&& chmod 640 /etc/sudoers.d/kolla_sahara_sudoers \
|
|
&& touch /usr/local/bin/kolla_sahara_extend_start \
|
|
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_sahara_extend_start
|
|
|
|
{% block sahara_base_footer %}{% endblock %}
|