aboutsummaryrefslogtreecommitdiff
path: root/docker/fluentd
diff options
context:
space:
mode:
authorjiangpch <jiangpengcheng@navercorp.com>2017-08-28 03:01:12 -0400
committerjiangpch <jiangpengcheng@navercorp.com>2017-08-28 03:13:45 -0400
commitaeb6e74bc35ee15ba6e5c43a1e16f245717ea444 (patch)
tree100f4fce75569630938a7fc0d89362df0386d62f /docker/fluentd
parent3bb081c793406a71834a4c3bb8c046bcd5b670c7 (diff)
downloadkolla-aeb6e74bc35ee15ba6e5c43a1e16f245717ea444.tar.gz
kolla-aeb6e74bc35ee15ba6e5c43a1e16f245717ea444.zip
fix image build error of fluentd
the newest public_suffix gem required ruby>2.1.0, but the ruby on centos' release is 2.0.0, we should install public_suffix==2.0.5 manual to avoid the ruby version not matched error. Closes-Bug: #1713416 Change-Id: I725294da206a73b759027d3123d140bddafcfdfb
Diffstat (limited to 'docker/fluentd')
-rw-r--r--docker/fluentd/Dockerfile.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2
index 7f0820e52..58cdedba7 100644
--- a/docker/fluentd/Dockerfile.j2
+++ b/docker/fluentd/Dockerfile.j2
@@ -40,7 +40,7 @@ COPY rpm_fluentd_sudoers /etc/sudoers.d/kolla_fluentd_sudoers
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN ulimit -n 65536 \
- && gem install --minimal-deps activesupport:4.2.9 fluent-plugin-parser fluent-plugin-kubernetes_metadata_filter fluent-plugin-elasticsearch fluent-plugin-grep fluent-plugin-grok-parser:0.3.1 fluent-plugin-rewrite-tag-filter \
+ && gem install --minimal-deps activesupport:4.2.9 public_suffix:2.0.5 fluent-plugin-parser fluent-plugin-kubernetes_metadata_filter fluent-plugin-elasticsearch fluent-plugin-grep fluent-plugin-grok-parser:0.3.1 fluent-plugin-rewrite-tag-filter \
&& chmod -R 440 /etc/sudoers.d/kolla_fluentd_sudoers \
&& chmod 755 /usr/local/bin/kolla_extend_start \
&& mkdir -p /var/run/fluentd \