Skip to content

K
k3s
Commit c41c24fb authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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

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
parents 3b31c9f0 279e20ed
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile
View file @ c41c24fb
...@@ -53,7 +53,6 @@ RUN apt-get -qq update && \ ...@@ -53,7 +53,6 @@ RUN apt-get -qq update && \
# Copy the Fluentd configuration files for logging Docker container logs. # Copy the Fluentd configuration files for logging Docker container logs.
# Either configuration file can be used by specifying `-c <file>` as a command # Either configuration file can be used by specifying `-c <file>` as a command
# line argument. # line argument.
RUN rm /etc/td-agent/td-agent.conf
COPY google-fluentd.conf /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 COPY google-fluentd-journal.conf /etc/td-agent/td-agent-journal.conf
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment