diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-02-09 15:43:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-02-09 15:43:19 +0000 |
| commit | 6cdb294960cdbeacae7bf198fcffa1d740d5d4e4 (patch) | |
| tree | 937a17ab85db77b7298b1bfb1b640f3d6146486c /docker/fluentd | |
| parent | 64117209763eccad222e628e1479dc3768da5c10 (diff) | |
| parent | 35314e77ee3aa288a07e6792236a9f398225bc67 (diff) | |
| download | kolla-6cdb294960cdbeacae7bf198fcffa1d740d5d4e4.tar.gz kolla-6cdb294960cdbeacae7bf198fcffa1d740d5d4e4.zip | |
Merge "Move fluentd td.repo to base for consistency"
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 1296d9022..33d7d4d1c 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 |