This repository has been archived by the owner on Mar 20, 2019. It is now read-only.
forked from fluent/fluentd-kubernetes-daemonset
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Masahiro Nakagawa <[email protected]>
- Loading branch information
1 parent
13ab91a
commit 360a3ea
Showing
79 changed files
with
282 additions
and
247 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| # AUTOMATICALLY GENERATED | ||
| # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb | ||
|
|
||
| FROM fluent/fluentd:v1.3.2-debian | ||
| FROM fluent/fluentd:v1.3.3-debian-1.0 | ||
|
|
||
| LABEL maintainer="Eduardo Silva <[email protected]>" | ||
| USER root | ||
|
|
@@ -34,6 +34,7 @@ COPY Gemfile* /fluentd/ | |
| COPY ./conf/fluent.conf /fluentd/etc/ | ||
| COPY ./conf/systemd.conf /fluentd/etc/ | ||
| COPY ./conf/kubernetes.conf /fluentd/etc/ | ||
| RUN touch /fluentd/etc/disable.conf | ||
|
|
||
| # Copy plugins | ||
| COPY plugins /fluentd/plugins/ | ||
|
|
@@ -47,4 +48,4 @@ ENV FLUENTD_CONF="fluent.conf" | |
| ENV LD_PRELOAD="/usr/lib/x86_64-linux-gnu/libjemalloc.so.1" | ||
|
|
||
| # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib | ||
| ENTRYPOINT ["/fluentd/entrypoint.sh"] | ||
| ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| #!/usr/bin/dumb-init /bin/sh | ||
| #!/bin/sh | ||
|
|
||
|
|
||
| exec fluentd -c /fluentd/etc/${FLUENTD_CONF} -p /fluentd/plugins --gemfile /fluentd/Gemfile ${FLUENTD_OPT} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| # AUTOMATICALLY GENERATED | ||
| # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb | ||
|
|
||
| FROM fluent/fluentd:v1.3.2-debian | ||
| FROM fluent/fluentd:v1.3.3-debian-1.0 | ||
|
|
||
| LABEL maintainer="Eduardo Silva <[email protected]>" | ||
| USER root | ||
|
|
@@ -34,6 +34,7 @@ COPY Gemfile* /fluentd/ | |
| COPY ./conf/fluent.conf /fluentd/etc/ | ||
| COPY ./conf/systemd.conf /fluentd/etc/ | ||
| COPY ./conf/kubernetes.conf /fluentd/etc/ | ||
| RUN touch /fluentd/etc/disable.conf | ||
|
|
||
| # Copy plugins | ||
| COPY plugins /fluentd/plugins/ | ||
|
|
@@ -47,4 +48,4 @@ ENV FLUENTD_CONF="fluent.conf" | |
| ENV LD_PRELOAD="/usr/lib/x86_64-linux-gnu/libjemalloc.so.1" | ||
|
|
||
| # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib | ||
| ENTRYPOINT ["/fluentd/entrypoint.sh"] | ||
| ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,16 @@ | ||
| #!/usr/bin/dumb-init /bin/sh | ||
| #!/bin/sh | ||
|
|
||
|
|
||
| set -e | ||
|
|
||
| if [ -z ${FLUENT_ELASTICSEARCH_USER} ] ; then | ||
| sed -i '/FLUENT_ELASTICSEARCH_USER/d' /fluentd/etc/${FLUENTD_CONF} | ||
| fi | ||
| if [ -z ${FLUENT_ELASTICSEARCH_SED_DISABLE} ] ; then | ||
| if [ -z ${FLUENT_ELASTICSEARCH_USER} ] ; then | ||
| sed -i '/FLUENT_ELASTICSEARCH_USER/d' /fluentd/etc/${FLUENTD_CONF} | ||
| fi | ||
|
|
||
| if [ -z ${FLUENT_ELASTICSEARCH_PASSWORD} ] ; then | ||
| sed -i '/FLUENT_ELASTICSEARCH_PASSWORD/d' /fluentd/etc/${FLUENTD_CONF} | ||
| if [ -z ${FLUENT_ELASTICSEARCH_PASSWORD} ] ; then | ||
| sed -i '/FLUENT_ELASTICSEARCH_PASSWORD/d' /fluentd/etc/${FLUENTD_CONF} | ||
| fi | ||
| fi | ||
|
|
||
| exec fluentd -c /fluentd/etc/${FLUENTD_CONF} -p /fluentd/plugins --gemfile /fluentd/Gemfile ${FLUENTD_OPT} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| # AUTOMATICALLY GENERATED | ||
| # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb | ||
|
|
||
| FROM fluent/fluentd:v1.3.2-debian | ||
| FROM fluent/fluentd:v1.3.3-debian-1.0 | ||
|
|
||
| LABEL maintainer="Eduardo Silva <[email protected]>" | ||
| USER root | ||
|
|
@@ -34,6 +34,7 @@ COPY Gemfile* /fluentd/ | |
| COPY ./conf/fluent.conf /fluentd/etc/ | ||
| COPY ./conf/systemd.conf /fluentd/etc/ | ||
| COPY ./conf/kubernetes.conf /fluentd/etc/ | ||
| RUN touch /fluentd/etc/disable.conf | ||
|
|
||
| # Copy plugins | ||
| COPY plugins /fluentd/plugins/ | ||
|
|
@@ -47,4 +48,4 @@ ENV FLUENTD_CONF="fluent.conf" | |
| ENV LD_PRELOAD="/usr/lib/x86_64-linux-gnu/libjemalloc.so.1" | ||
|
|
||
| # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib | ||
| ENTRYPOINT ["/fluentd/entrypoint.sh"] | ||
| ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.