From 35314e77ee3aa288a07e6792236a9f398225bc67 Mon Sep 17 00:00:00 2001 From: Paul Bourke Date: Tue, 7 Feb 2017 10:47:44 +0000 Subject: Move fluentd td.repo to base for consistency Additional repos for centos such as elasticsearch, ceph etc. are all set up in the base image, fluentd should follow this both for consistency and to make it easier for operators to remove/override. Change-Id: If2ee20232d72ccf6b1c4be06c2fb3d1fa219e9cc --- docker/fluentd/Dockerfile.j2 | 8 -------- 1 file changed, 8 deletions(-) (limited to 'docker/fluentd/Dockerfile.j2') diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 index 405e10c5f..01416ae48 100644 --- a/docker/fluentd/Dockerfile.j2 +++ b/docker/fluentd/Dockerfile.j2 @@ -9,10 +9,6 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} -RUN rpm --import https://packages.treasuredata.com/GPG-KEY-td-agent - -COPY td.repo /etc/yum.repos.d/td.repo - {% set fluentd_packages = [ 'td-agent', 'gcc-c++', @@ -21,10 +17,6 @@ COPY td.repo /etc/yum.repos.d/td.repo {% elif base_distro in ['ubuntu', 'debian'] %} -RUN curl https://packages.treasuredata.com/GPG-KEY-td-agent | apt-key add - \ - && echo "deb http://packages.treasuredata.com/2/ubuntu/xenial/ xenial contrib" > /etc/apt/sources.list.d/treasure-data.list \ - && apt-get update - {% set fluentd_packages = [ 'td-agent', 'make', -- cgit v1.2.3