diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/apt_preferences.ubuntu | 5 | ||||
| -rw-r--r-- | docker/fluentd/Dockerfile.j2 | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu index c8e36affd..2928ee662 100644 --- a/docker/base/apt_preferences.ubuntu +++ b/docker/base/apt_preferences.ubuntu @@ -5,3 +5,8 @@ Pin-Priority: 1000 Package: erlang* Pin: version 1:23.* Pin-Priority: 1000 + +# FIXME(mgoddard): Pinning to 4.0.* to avoid bug 1930867. +Package: td-agent* +Pin: version 4.0.* +Pin-Priority: 1000 diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 index 29176c0cf..0f3fe11df 100644 --- a/docker/fluentd/Dockerfile.j2 +++ b/docker/fluentd/Dockerfile.j2 @@ -27,8 +27,9 @@ LABEL fluentd_version="0.14" fluentd_binary="td-agent" ] %} {% if base_arch in ['aarch64', 'x86_64'] %} + # FIXME(mgoddard): Pinning to 4.0.* to avoid bug 1930867. {% set fluentd_packages = fluentd_packages + [ - 'td-agent' + 'td-agent-4.0.*' ] %} {% else %} {% set fluentd_packages = fluentd_packages + [ |