Skip to content
This repository has been archived by the owner on Mar 20, 2019. It is now read-only.

Commit

Permalink
Add v1.3 images
Browse files Browse the repository at this point in the history
Signed-off-by: Masahiro Nakagawa <[email protected]>
  • Loading branch information
repeatedly committed Nov 22, 2018
1 parent 4c01c44 commit e5fde81
Show file tree
Hide file tree
Showing 173 changed files with 8,869 additions and 26 deletions.
26 changes: 13 additions & 13 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,19 @@ ALL_IMAGES := \
v0.12/debian-kafka:v0.12.43-debian-kafka,v0.12-debian-kafka,debian-kafka \
v0.12/debian-splunkhec:v0.12.43-debian-splunkhec,v0.12-debian-splunkhec,debian-splunkhec \
v0.12/debian-kinesis:v0.12.43-debian-kinesis,v0.12-debian-kinesis,debian-kinesis \
v1.2/debian-elasticsearch:v1.2.6-debian-elasticsearch,v1.2-debian-elasticsearch \
v1.2/debian-loggly:v1.2.6-debian-loggly,v1.2-debian-loggly \
v1.2/debian-logentries:v1.2.6-debian-logentries,v1.2-debian-logentries \
v1.2/debian-cloudwatch:v1.2.6-debian-cloudwatch,v1.2-debian-cloudwatch \
v1.2/debian-stackdriver:v1.2.6-debian-stackdriver,v1.2-debian-stackdriver \
v1.2/debian-s3:v1.2.6-debian-s3,v1.2-debian-s3 \
v1.2/debian-syslog:v1.2.6-debian-syslog,v1.2-debian-syslog \
v1.2/debian-gcs:v1.2.6-debian-gcs,v1.2-debian-gcs \
v1.2/debian-graylog:v1.2.6-debian-graylog,v1.2-debian-graylog,debian-stable-graylog \
v1.2/debian-papertrail:v1.2.6-debian-papertrail,v1.2-debian-papertrail \
v1.2/debian-logzio:v1.2.6-debian-logzio,v1.2-debian-logzio,debian-logzio \
v1.2/debian-kafka:v1.2.6-debian-kafka,v1.2-debian-kafka \
v1.2/debian-kinesis:v1.2.6-debian-kinesis,v1.2-debian-kinesis
v1.3/debian-elasticsearch:v1.3.0-debian-elasticsearch,v1.3-debian-elasticsearch \
v1.3/debian-loggly:v1.3.0-debian-loggly,v1.3-debian-loggly \
v1.3/debian-logentries:v1.3.0-debian-logentries,v1.3-debian-logentries \
v1.3/debian-cloudwatch:v1.3.0-debian-cloudwatch,v1.3-debian-cloudwatch \
v1.3/debian-stackdriver:v1.3.0-debian-stackdriver,v1.3-debian-stackdriver \
v1.3/debian-s3:v1.3.0-debian-s3,v1.3-debian-s3 \
v1.3/debian-syslog:v1.3.0-debian-syslog,v1.3-debian-syslog \
v1.3/debian-gcs:v1.3.0-debian-gcs,v1.3-debian-gcs \
v1.3/debian-graylog:v1.3.0-debian-graylog,v1.3-debian-graylog,debian-stable-graylog \
v1.3/debian-papertrail:v1.3.0-debian-papertrail,v1.3-debian-papertrail \
v1.3/debian-logzio:v1.3.0-debian-logzio,v1.3-debian-logzio,debian-logzio \
v1.3/debian-kafka:v1.3.0-debian-kafka,v1.3-debian-kafka \
v1.3/debian-kinesis:v1.3.0-debian-kinesis,v1.3-debian-kinesis

# <Dockerfile>:<version>,<tag1>,<tag2>,...

Expand Down
26 changes: 13 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,19 @@
- `v0.12-debian-kafka` [docker-image/v0.12/debian-kafka/Dockerfile](docker-image/v0.12/debian-kafka/Dockerfile)
- `v0.12-debian-splunkhec` [docker-image/v0.12/debian-splunkhec/Dockerfile](docker-image/v0.12/debian-splunkhec/Dockerfile)
- `v0.12-debian-kinesis` [docker-image/v0.12/debian-kinesis/Dockerfile](docker-image/v0.12/debian-kinesis/Dockerfile)
- `v1.2-debian-elasticsearch` [docker-image/v1.2/debian-elasticsearch/Dockerfile](docker-image/v1.2/debian-elasticsearch/Dockerfile)
- `v1.2-debian-loggly` [docker-image/v1.2/debian-loggly/Dockerfile](docker-image/v1.2/debian-loggly/Dockerfile)
- `v1.2-debian-logentries` [docker-image/v1.2/debian-logentries/Dockerfile](docker-image/v1.2/debian-logentries/Dockerfile)
- `v1.2-debian-cloudwatch` [docker-image/v1.2/debian-cloudwatch/Dockerfile](docker-image/v1.2/debian-cloudwatch/Dockerfile)
- `v1.2-debian-stackdriver` [docker-image/v1.2/debian-stackdriver/Dockerfile](docker-image/v1.2/debian-stackdriver/Dockerfile)
- `v1.2-debian-s3` [docker-image/v1.2/debian-s3/Dockerfile](docker-image/v1.2/debian-s3/Dockerfile)
- `v1.2-debian-syslog` [docker-image/v1.2/debian-syslog/Dockerfile](docker-image/v1.2/debian-syslog/Dockerfile)
- `v1.2-debian-gcs` [docker-image/v1.2/debian-gcs/Dockerfile](docker-image/v1.2/debian-gcs/Dockerfile)
- `v1.2-debian-graylog` [docker-image/v1.2/debian-graylog/Dockerfile](docker-image/v1.2/debian-graylog/Dockerfile)
- `v1.2-debian-papertrail` [docker-image/v1.2/debian-papertrail/Dockerfile](docker-image/v1.2/debian-papertrail/Dockerfile)
- `v1.2-debian-logzio` [docker-image/v1.2/debian-logzio/Dockerfile](docker-image/v1.2/debian-logzio/Dockerfile)
- `v1.2-debian-kafka` [docker-image/v1.2/debian-kafka/Dockerfile](docker-image/v1.2/debian-kafka/Dockerfile)
- `v1.2-debian-kinesis` [docker-image/v1.2/debian-kinesis/Dockerfile](docker-image/v1.2/debian-kinesis/Dockerfile)
- `v1.3-debian-elasticsearch` [docker-image/v1.3/debian-elasticsearch/Dockerfile](docker-image/v1.3/debian-elasticsearch/Dockerfile)
- `v1.3-debian-loggly` [docker-image/v1.3/debian-loggly/Dockerfile](docker-image/v1.3/debian-loggly/Dockerfile)
- `v1.3-debian-logentries` [docker-image/v1.3/debian-logentries/Dockerfile](docker-image/v1.3/debian-logentries/Dockerfile)
- `v1.3-debian-cloudwatch` [docker-image/v1.3/debian-cloudwatch/Dockerfile](docker-image/v1.3/debian-cloudwatch/Dockerfile)
- `v1.3-debian-stackdriver` [docker-image/v1.3/debian-stackdriver/Dockerfile](docker-image/v1.3/debian-stackdriver/Dockerfile)
- `v1.3-debian-s3` [docker-image/v1.3/debian-s3/Dockerfile](docker-image/v1.3/debian-s3/Dockerfile)
- `v1.3-debian-syslog` [docker-image/v1.3/debian-syslog/Dockerfile](docker-image/v1.3/debian-syslog/Dockerfile)
- `v1.3-debian-gcs` [docker-image/v1.3/debian-gcs/Dockerfile](docker-image/v1.3/debian-gcs/Dockerfile)
- `v1.3-debian-graylog` [docker-image/v1.3/debian-graylog/Dockerfile](docker-image/v1.3/debian-graylog/Dockerfile)
- `v1.3-debian-papertrail` [docker-image/v1.3/debian-papertrail/Dockerfile](docker-image/v1.3/debian-papertrail/Dockerfile)
- `v1.3-debian-logzio` [docker-image/v1.3/debian-logzio/Dockerfile](docker-image/v1.3/debian-logzio/Dockerfile)
- `v1.3-debian-kafka` [docker-image/v1.3/debian-kafka/Dockerfile](docker-image/v1.3/debian-kafka/Dockerfile)
- `v1.3-debian-kinesis` [docker-image/v1.3/debian-kinesis/Dockerfile](docker-image/v1.3/debian-kinesis/Dockerfile)

### Alpine Linux

Expand Down
1 change: 1 addition & 0 deletions docker-image/v1.3/debian-cloudwatch/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
**/*.gitkeep
50 changes: 50 additions & 0 deletions docker-image/v1.3/debian-cloudwatch/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# AUTOMATICALLY GENERATED
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

FROM fluent/fluentd:v1.3.0-debian

LABEL maintainer="Eduardo Silva <[email protected]>"
USER root
WORKDIR /home/fluent
ENV PATH /fluentd/vendor/bundle/ruby/2.3.0/bin:$PATH
ENV GEM_PATH /fluentd/vendor/bundle/ruby/2.3.0
ENV GEM_HOME /fluentd/vendor/bundle/ruby/2.3.0
# skip runtime bundler installation
ENV FLUENTD_DISABLE_BUNDLER_INJECTION 1

COPY Gemfile* /fluentd/
RUN buildDeps="sudo make gcc g++ libc-dev ruby-dev libffi-dev" \
&& apt-get update \
&& apt-get upgrade -y \
&& apt-get install \
-y --no-install-recommends \
$buildDeps net-tools libjemalloc1 \
&& gem install bundler --version 1.16.2 \
&& bundle config silence_root_warning true \
&& bundle install --gemfile=/fluentd/Gemfile --path=/fluentd/vendor/bundle \
&& SUDO_FORCE_REMOVE=yes \
apt-get purge -y --auto-remove \
-o APT::AutoRemove::RecommendsImportant=false \
$buildDeps \
&& rm -rf /var/lib/apt/lists/* \
&& gem sources --clear-all \
&& rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

# Copy configuration files
COPY ./conf/fluent.conf /fluentd/etc/
COPY ./conf/systemd.conf /fluentd/etc/
COPY ./conf/kubernetes.conf /fluentd/etc/

# Copy plugins
COPY plugins /fluentd/plugins/
COPY entrypoint.sh /fluentd/entrypoint.sh

# Environment variables
ENV FLUENTD_OPT=""
ENV FLUENTD_CONF="fluent.conf"

# See https://packages.debian.org/stretch/amd64/libjemalloc1/filelist
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"]
13 changes: 13 additions & 0 deletions docker-image/v1.3/debian-cloudwatch/Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# AUTOMATICALLY GENERATED
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Gemfile.erb

source "https://rubygems.org"

gem "fluentd", "1.3.0"
gem "oj", "3.5.1"
gem "fluent-plugin-rewrite-tag-filter", "~> 2.1.0"
gem "aws-sdk-cloudwatchlogs", "~> 1.0"
gem "fluent-plugin-cloudwatch-logs", "~> 0.6.1"
gem "fluent-plugin-kubernetes_metadata_filter", "~> 2.1.4"
gem "ffi"
gem "fluent-plugin-systemd", "~> 1.0.1"
115 changes: 115 additions & 0 deletions docker-image/v1.3/debian-cloudwatch/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (5.2.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
aws-eventstream (1.0.1)
aws-partitions (1.111.0)
aws-sdk-cloudwatchlogs (1.10.0)
aws-sdk-core (~> 3, >= 3.26.0)
aws-sigv4 (~> 1.0)
aws-sdk-core (3.37.0)
aws-eventstream (~> 1.0)
aws-partitions (~> 1.0)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
aws-sigv4 (1.0.3)
concurrent-ruby (1.1.3)
cool.io (1.5.3)
dig_rb (1.0.1)
domain_name (0.5.20180417)
unf (>= 0.0.5, < 1.0.0)
ffi (1.9.25)
fluent-config-regexp-type (1.0.0)
fluentd (> 1.0.0, < 2)
fluent-plugin-cloudwatch-logs (0.6.1)
aws-sdk-cloudwatchlogs (~> 1.0)
fluentd (>= 0.14.15)
fluent-plugin-kubernetes_metadata_filter (2.1.4)
fluentd (>= 0.14.0, < 2)
kubeclient (~> 1.1.4)
lru_redux
fluent-plugin-rewrite-tag-filter (2.1.0)
fluent-config-regexp-type
fluentd (>= 0.14.2, < 2)
fluent-plugin-systemd (1.0.1)
fluentd (>= 0.14.11, < 2)
systemd-journal (~> 1.3.2)
fluentd (1.3.0)
cool.io (>= 1.4.5, < 2.0.0)
dig_rb (~> 1.0.0)
http_parser.rb (>= 0.5.1, < 0.7.0)
msgpack (>= 0.7.0, < 2.0.0)
serverengine (>= 2.0.4, < 3.0.0)
sigdump (~> 0.2.2)
strptime (>= 0.2.2, < 1.0.0)
tzinfo (~> 1.0)
tzinfo-data (~> 1.0)
yajl-ruby (~> 1.0)
http (0.9.8)
addressable (~> 2.3)
http-cookie (~> 1.0)
http-form_data (~> 1.0.1)
http_parser.rb (~> 0.6.0)
http-cookie (1.0.3)
domain_name (~> 0.5)
http-form_data (1.0.3)
http_parser.rb (0.6.0)
i18n (1.1.1)
concurrent-ruby (~> 1.0)
jmespath (1.4.0)
kubeclient (1.1.4)
activesupport
http (= 0.9.8)
recursive-open-struct (= 1.0.0)
rest-client
lru_redux (1.1.0)
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2018.0812)
minitest (5.11.3)
msgpack (1.2.4)
netrc (0.11.0)
oj (3.5.1)
public_suffix (3.0.3)
recursive-open-struct (1.0.0)
rest-client (2.0.2)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
serverengine (2.0.7)
sigdump (~> 0.2.2)
sigdump (0.2.4)
strptime (0.2.3)
systemd-journal (1.3.3)
ffi (~> 1.9)
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
tzinfo-data (1.2018.7)
tzinfo (>= 1.0.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.5)
yajl-ruby (1.4.1)

PLATFORMS
ruby

DEPENDENCIES
aws-sdk-cloudwatchlogs (~> 1.0)
ffi
fluent-plugin-cloudwatch-logs (~> 0.6.1)
fluent-plugin-kubernetes_metadata_filter (~> 2.1.4)
fluent-plugin-rewrite-tag-filter (~> 2.1.0)
fluent-plugin-systemd (~> 1.0.1)
fluentd (= 1.3.0)
oj (= 3.5.1)

BUNDLED WITH
1.16.1
15 changes: 15 additions & 0 deletions docker-image/v1.3/debian-cloudwatch/conf/fluent.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@

# AUTOMATICALLY GENERATED
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/conf/fluent.conf.erb

@include systemd.conf
@include kubernetes.conf

<match **>
@type cloudwatch_logs
@id out_cloudwatch_logs
log_group_name "#{ENV['LOG_GROUP_NAME']}"
auto_create_stream true
use_tag_as_stream true
json_handler yajl # To avoid UndefinedConversionError
</match>
Loading

0 comments on commit e5fde81

Please sign in to comment.