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
38 lines
1.2 KiB
Django/Jinja
38 lines
1.2 KiB
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
|
MAINTAINER {{ maintainer }}
|
|
|
|
{% import "macros.j2" as macros with context %}
|
|
|
|
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
|
|
{% set heka_packages = [
|
|
'https://github.com/mozilla-services/heka/releases/download/v0.10.0/heka-0_10_0-linux-amd64.rpm'
|
|
] %}
|
|
RUN useradd --user-group heka \
|
|
&& mkdir /etc/heka
|
|
|
|
{% elif base_distro in ['ubuntu', 'debian'] %}
|
|
{% set heka_packages = [
|
|
'https://github.com/mozilla-services/heka/releases/download/v0.10.0/heka_0.10.0_amd64.deb'
|
|
] %}
|
|
{% endif %}
|
|
|
|
{{ macros.install_packages(heka_packages | customizable("packages")) }}
|
|
|
|
COPY plugins/modules /usr/share/heka/lua_modules/
|
|
COPY plugins/decoders /usr/share/heka/lua_decoders/
|
|
COPY plugins/encoders /usr/share/heka/lua_encoders/
|
|
|
|
COPY heka_sudoers /etc/sudoers.d/kolla_heka_sudoers
|
|
COPY extend_start.sh /usr/local/bin/kolla_extend_start
|
|
|
|
RUN usermod -a -G kolla heka \
|
|
&& chmod 440 /etc/sudoers.d/kolla_heka_sudoers \
|
|
&& chmod 755 /usr/local/bin/kolla_extend_start \
|
|
&& chown -R heka: /usr/share/heka /etc/heka
|
|
|
|
{% block heka_footer %}{% endblock %}
|
|
{% block footer %}{% endblock %}
|
|
{{ include_footer }}
|
|
|
|
USER heka
|