github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-08 20:50:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7384 from a-robinson/opts

Browse Source 
Remove unused env variable from the fluentd dockerfiles
This commit is contained in:
Alex Robinson
2015-04-27 17:18:17 -07:00
parent 5ea5fff586 ada9242155
commit 743945f3aa
4 changed files with 9 additions and 6 deletions
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