github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Remove unused env variable from the fluentd dockerfiles and make their apt-get

Browse Source 
arguments consistent.
This commit is contained in:
Alex Robinson 2015-04-27 20:47:38 +00:00
parent 83093af8b0
commit ada9242155
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile
View File

@ -14,6 +14,9 @@ MAINTAINER Satnam Singh "satnam@google.com"
# Ensure there are enough file descriptors for running Fluentd.
RUN ulimit -n 65536
# Disable prompts from apt.
ENV DEBIAN_FRONTEND noninteractive
# Install prerequisites.
RUN apt-get update && \
apt-get install -y curl && \

3
cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile
View File

@ -11,10 +11,9 @@ MAINTAINER Satnam Singh "satnam@google.com"
# Disable prompts from apt.
ENV DEBIAN_FRONTEND noninteractive
ENV OPTS_APT -y --force-yes --no-install-recommends
RUN apt-get -q update && \
apt-get -y install curl && \
apt-get install -y curl && \
apt-get clean && \
curl -s https://storage.googleapis.com/signals-agents/logging/google-fluentd-install.sh | sudo bash

6
contrib/logging/fluentd-sidecar-es/Dockerfile
View File

@ -10,14 +10,16 @@
FROM ubuntu:14.04
MAINTAINER Alex Robinson "arob@google.com"
# Ensure there are enough file descriptors for running Fluentd.
RUN ulimit -n 65536
# Disable prompts from apt.
ENV DEBIAN_FRONTEND noninteractive
ENV OPTS_APT -y --force-yes --no-install-recommends
# Install the standard, official Fluentd agent (called td-agent, for the
# project's parent company, Treasure Data).
RUN apt-get -q update && \
apt-get -y install curl && \
apt-get install -y curl && \
apt-get install -y -q libcurl4-openssl-dev make && \
apt-get clean
RUN /usr/bin/curl -L http://toolbelt.treasuredata.com/sh/install-ubuntu-trusty-td-agent2.sh | sh

3
contrib/logging/fluentd-sidecar-gcp/Dockerfile
View File

@ -13,11 +13,10 @@ MAINTAINER Alex Robinson "arob@google.com"
# Disable prompts from apt.
ENV DEBIAN_FRONTEND noninteractive
ENV OPTS_APT -y --force-yes --no-install-recommends
# Install the Fluentd agent that knows how to send logs to Google Cloud Logging.
RUN apt-get -q update && \
apt-get -y install curl && \
apt-get install -y curl && \
apt-get clean && \
curl -s https://storage.googleapis.com/signals-agents/logging/google-fluentd-install.sh | sudo bash