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
43 lines
1.7 KiB
Django/Jinja
43 lines
1.7 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 ceilometer_base_packages = [
|
|
'openstack-ceilometer-common',
|
|
'python-tooz',
|
|
'python-oslo-db'
|
|
] %}
|
|
{% elif base_distro in ['ubuntu'] %}
|
|
{% set ceilometer_base_packages = [
|
|
'ceilometer-common',
|
|
'python-pymongo'
|
|
] %}
|
|
{% endif %}
|
|
|
|
{{ macros.install_packages(ceilometer_base_packages | customizable("packages")) }}
|
|
|
|
{% elif install_type == 'source' %}
|
|
|
|
ADD ceilometer-base-archive /ceilometer-base-source
|
|
RUN ln -s ceilometer-base-source/* ceilometer \
|
|
&& useradd --user-group ceilometer \
|
|
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /ceilometer pymongo \
|
|
&& mkdir -p /etc/ceilometer /var/log/ceilometer /home/ceilometer \
|
|
&& cp -r /ceilometer/etc/ceilometer/* /etc/ceilometer/ \
|
|
&& chown -R ceilometer: /etc/ceilometer /var/log/ceilometer /home/ceilometer \
|
|
&& 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/ceilometer/rootwrap.conf
|
|
|
|
{% endif %}
|
|
|
|
COPY ceilometer_sudoers /etc/sudoers.d/kolla_ceilometer_sudoers
|
|
COPY extend_start.sh /usr/local/bin/kolla_extend_start
|
|
|
|
RUN usermod -a -G kolla ceilometer \
|
|
&& chmod 750 /etc/sudoers.d \
|
|
&& chmod 440 /etc/sudoers.d/kolla_ceilometer_sudoers \
|
|
&& touch /usr/local/bin/kolla_ceilometer_extend_start \
|
|
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_ceilometer_extend_start
|