diff options
Diffstat (limited to 'docker/sensu')
| -rw-r--r-- | docker/sensu/sensu-client/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/sensu/sensu-server/Dockerfile.j2 | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/docker/sensu/sensu-client/Dockerfile.j2 b/docker/sensu/sensu-client/Dockerfile.j2 index 7e9580432..f0317d7b3 100644 --- a/docker/sensu/sensu-client/Dockerfile.j2 +++ b/docker/sensu/sensu-client/Dockerfile.j2 @@ -89,7 +89,8 @@ RUN echo '{{ image_name }} not yet available for {{ base_distro }}' \ # NOTE(hrw): whois 5.0.0 requires Ruby 2.4+ while CentOS has 2.0 # NOTE(yoctozepto): pinning minitest for the same reason # NOTE(yoctozepto): pinning simpleidn because it started requiring Ruby 2.2 -RUN {%if base_package_type == 'rpm' %} gem install whois:"<5" minitest:"~>5.11.3" simpleidn:"~>0.1.1" && {% endif %} sensu-install --plugins {{ sensu_plugins | customizable('plugins') | join (',') }} +# NOTE(hrw): gem order is crucial - simpleidn depends on unf_ext +RUN {%if base_package_type == 'rpm' %} gem install whois:"<5" minitest:"~>5.11.3" unf_ext:"<0.0.7.7" simpleidn:"~>0.1.1" && {% endif %} sensu-install --plugins {{ sensu_plugins | customizable('plugins') | join (',') }} {% endblock %} {% block sensu_client_footer %}{% endblock %} diff --git a/docker/sensu/sensu-server/Dockerfile.j2 b/docker/sensu/sensu-server/Dockerfile.j2 index fa447fe7c..543262de8 100644 --- a/docker/sensu/sensu-server/Dockerfile.j2 +++ b/docker/sensu/sensu-server/Dockerfile.j2 @@ -31,7 +31,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'slack:"~>3"' ] %} -RUN sensu-install --plugins {{ sensu_plugins | customizable('plugins') | join (',') }} +RUN {%if base_package_type == 'rpm' %} gem install unf_ext:"<0.0.7.7" && {% endif %} sensu-install --plugins {{ sensu_plugins | customizable('plugins') | join (',') }} {% endblock %} {% block sensu_server_footer %}{% endblock %} |