a9d08726f5
Currently if the install_packages macro is run with an empty package list, it will add a yum or apt-get command with no packages listed. This bug fix aims to omit this line when no packages have been given, or, the operator wants to use the "_override" / "_remove" functionality to disable all packages being installed in a Dockerfile. Co-Authored-By: Paul Bourke <paul.bourke@oracle.com> Change-Id: Ifaaaebfccc3adb0f2f68a35ac08e59378bc87fdb Closes-bug: 1612446
31 lines
1.0 KiB
Django/Jinja
31 lines
1.0 KiB
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
|
|
MAINTAINER {{ maintainer }}
|
|
|
|
{% import "macros.j2" as macros with context %}
|
|
|
|
{% if install_type == 'binary' %}
|
|
|
|
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
|
|
{% set sahara_base_packages = ['openstack-sahara-common'] %}
|
|
{% elif base_distro in ['ubuntu'] %}
|
|
{% set sahara_base_packages = ['sahara-common'] %}
|
|
{% endif %}
|
|
{{ macros.install_packages(sahara_base_packages | customizable("packages")) }}
|
|
|
|
{% elif install_type == 'source' %}
|
|
|
|
ADD sahara-base-archive /sahara-base-source
|
|
RUN ln -s sahara-base-source/* sahara \
|
|
&& useradd --user-group sahara \
|
|
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /sahara \
|
|
&& mkdir -p /etc/sahara /var/log/sahara /home/sahara \
|
|
&& cp -r /sahara/etc/* /etc/sahara/ \
|
|
&& chown -R sahara: /etc/sahara /var/log/sahara /home/sahara
|
|
|
|
{% endif %}
|
|
|
|
RUN usermod -a -G kolla sahara
|
|
|
|
{% block sahara_base_footer %}{% endblock %}
|
|
{% block footer %}{% endblock %}
|