github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #36370 from Crassirostris/flunetd-gcp-image-fix

Browse Source 
Automatic merge from submit-queue

Fix config file names inside fluentd-gcp image

Need this in order to merge https://github.com/kubernetes/kubernetes/pull/36358

Because on container-vm we need implicitly used configuration file

@piosz
This commit is contained in:
Kubernetes Submit Queue 2016-11-07 13:51:07 -08:00 committed by GitHub
commit 465c6b749c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,8 +53,9 @@ 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.
COPY google-fluentd.conf /etc/td-agent/google-fluentd.conf
COPY google-fluentd-journal.conf /etc/td-agent/google-fluentd-journal.conf
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
# Start Fluentd to pick up our config that watches Docker container logs.
CMD /usr/sbin/td-agent "$FLUENTD_ARGS"
CMD /usr/sbin/td-agent $FLUENTD_ARGS