Merge "Customizations for RabbitMQ"

This commit is contained in:
Jenkins 2016-08-28 16:04:07 +00:00 committed by Gerrit Code Review
commit a86e13a15a

View File

@ -1,26 +1,30 @@
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% import "macros.j2" as macros with context %}
RUN yum -y install \ {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
hostname \ {% set rabbitmq_packages = [
https://github.com/rabbitmq/rabbitmq-server/releases/download/rabbitmq_v3_5_7/rabbitmq-server-3.5.7-1.noarch.rpm \ 'hostname',
&& yum clean all 'https://github.com/rabbitmq/rabbitmq-server/releases/download/rabbitmq_v3_5_7/rabbitmq-server-3.5.7-1.noarch.rpm'
] %}
{{ macros.install_packages(rabbitmq_packages | customizable("packages")) }}
{% elif base_distro == 'ubuntu' %} {% elif base_distro == 'ubuntu' %}
{% set rabbitmq_packages = [
'rabbitmq-server'
] %}
RUN apt-get -y install --no-install-recommends \ {{ macros.install_packages(rabbitmq_packages | customizable("packages")) }}
rabbitmq-server \
&& apt-get clean
{% elif base_distro == 'debian' %} {% elif base_distro == 'debian' %}
{% set rabbitmq_packages = [
'erlang-nox',
'http://www.rabbitmq.com/releases/rabbitmq-server/v3.5.7/rabbitmq-server_3.5.7-1_all.deb'
] %}
RUN apt-get -y install --no-install-recommends \ {{ macros.install_packages(rabbitmq_packages | customizable("packages")) }}
erlang-nox \
&& curl -s -O http://www.rabbitmq.com/releases/rabbitmq-server/v3.5.7/rabbitmq-server_3.5.7-1_all.deb \
&& dpkg -i --force-depends rabbitmq-server_3.5.7-1_all.deb \
&& rm rabbitmq-server_3.5.7-1_all.deb
{% endif %} {% endif %}
@ -42,6 +46,7 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/rabbitmq_get_gosp
&& chmod 440 /etc/sudoers.d/kolla_rabbitmq_sudoers \ && chmod 440 /etc/sudoers.d/kolla_rabbitmq_sudoers \
&& usermod -a -G kolla rabbitmq && usermod -a -G kolla rabbitmq
{% block rabbitmq_footer %}{% endblock %}
{{ include_footer }} {{ include_footer }}
USER rabbitmq USER rabbitmq