diff options
| author | Paul Bourke <paul.bourke@oracle.com> | 2017-02-07 10:47:44 +0000 |
|---|---|---|
| committer | Paul Bourke <paul.bourke@oracle.com> | 2017-02-08 12:48:50 +0000 |
| commit | 35314e77ee3aa288a07e6792236a9f398225bc67 (patch) | |
| tree | 64b22728d178afedaacc3c91cd85ac235a0d264d /docker/fluentd | |
| parent | 40130b2e7a591931ddac366dc6f8d085e1f83e37 (diff) | |
| download | kolla-35314e77ee3aa288a07e6792236a9f398225bc67.tar.gz kolla-35314e77ee3aa288a07e6792236a9f398225bc67.zip | |
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
Diffstat (limited to 'docker/fluentd')
| -rw-r--r-- | docker/fluentd/Dockerfile.j2 | 8 | ||||
| -rw-r--r-- | docker/fluentd/td.repo | 5 |
2 files changed, 0 insertions, 13 deletions
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', diff --git a/docker/fluentd/td.repo b/docker/fluentd/td.repo deleted file mode 100644 index abecf7e2c..000000000 --- a/docker/fluentd/td.repo +++ /dev/null @@ -1,5 +0,0 @@ -[treasuredata] -name=TreasureData -baseurl=http://packages.treasuredata.com/2/redhat/\$releasever/\$basearch -gpgcheck=1 -gpgkey=https://packages.treasuredata.com/GPG-KEY-td-agent |