github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #36443 from Crassirostris/fix-fluentd-gcp-image

Browse Source 
Automatic merge from submit-queue

Fix flunetd-gcp image Dockerfile

A mistake was made during rebasing this PR: https://github.com/kubernetes/kubernetes/pull/36370

One line, earlier deleted, was restored and broke the image build.

@piosz
This commit is contained in:
Kubernetes Submit Queue 2016-11-08 07:18:48 -08:00 committed by GitHub
commit c41c24fbf3
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,6 @@ RUN apt-get -qq update && \
# Copy the Fluentd configuration files for logging Docker container logs.
# Either configuration file can be used by specifying `-c <file>` as a command
# line argument.
RUN rm /etc/td-agent/td-agent.conf
COPY google-fluentd.conf /etc/td-agent/td-agent.conf
COPY google-fluentd-journal.conf /etc/td-agent/td-agent-journal.conf