Merge pull request #86 from errm/bundler

Use Bundler to manage gem dependencies
fluent · Apr 24, 2018 · 5fdac63 · 5fdac63
2 parents 18f317a + 6f15b4f
commit 5fdac63
Show file tree

Hide file tree

Showing 98 changed files with 3,141 additions and 258 deletions.
diff --git a/Makefile b/Makefile
@@ -127,7 +127,7 @@ release-all:
 # Usage:
 #	make src [DOCKERFILE=] [VERSION=] [TAGS=t1,t2,...]
 
-src: dockerfile fluent.conf systemd.conf kubernetes.conf plugins post-push-hook entrypoint.sh
+src: dockerfile gemfile fluent.conf systemd.conf kubernetes.conf plugins post-push-hook entrypoint.sh
 
 # Generate sources for all supported Docker images.
 #
@@ -158,6 +158,20 @@ dockerfile:
 			version='$(VERSION)' \
 		/Dockerfile.erb > docker-image/$(DOCKERFILE)/Dockerfile
 
+# Generate Gemfile and Gemfile.lock from template.
+#
+# Usage:
+#	make gemfile [DOCKERFILE=] [VERSION=]
+gemfile:
+	mkdir -p docker-image/$(DOCKERFILE)
+	docker run --rm -i -v $(PWD)/templates/Gemfile.erb:/Gemfile.erb:ro \
+		ruby:alpine erb -U -T 1 \
+			dockerfile='$(DOCKERFILE)' \
+			version='$(VERSION)' \
+		/Gemfile.erb > docker-image/$(DOCKERFILE)/Gemfile
+	docker run --rm -i -v $(PWD)/docker-image/$(DOCKERFILE)/Gemfile:/Gemfile:ro \
+		ruby:alpine sh -c "apk add --no-cache --quiet git && bundle lock --print" > docker-image/${DOCKERFILE}/Gemfile.lock
+
 # Generate entrypoint.sh from template.
 #
 # Usage:
@@ -243,6 +257,19 @@ dockerfile-all:
 			                 $(word 2,$(subst :, ,$(img))))) ; \
 	))
 
+# Generate Gemfile and Gemfile.lock from template for all supported Docker images.
+#
+# Usage:
+#	make gemfile-all
+
+gemfile-all:
+	(set -e ; $(foreach img,$(ALL_IMAGES), \
+		make gemfile \
+			DOCKERFILE=$(word 1,$(subst :, ,$(img))) \
+			VERSION=$(word 1,$(subst $(comma), ,\
+			                 $(word 2,$(subst :, ,$(img))))) ; \
+	))
+
 # Generate entrypoint.sh from template for all supported Docker images.
 #
 # Usage:
@@ -310,6 +337,7 @@ post-push-hook-all:
         release release-all \
         src src-all \
         dockerfile dockerfile-all \
+        gemfile gemfile-all \
         entrypoint.sh entrypoint.sh-all \
         fluent.conf fluent.conf-all \
         kubernetes.conf kubernetes.conf-all\

diff --git a/docker-image/v0.12/alpine-cloudwatch/Dockerfile b/docker-image/v0.12/alpine-cloudwatch/Dockerfile
@@ -7,19 +7,16 @@ USER root
 WORKDIR /home/fluent
 ENV PATH /home/fluent/.gem/ruby/2.3.0/bin:$PATH
 
+COPY Gemfile* /fluentd/
 RUN set -ex \
-    && apk update && apk upgrade \
+    && apk upgrade --no-cache \
+    && apk add --no-cache ruby-bundler \
     && apk add --no-cache --virtual .build-deps \
         build-base \
         ruby-dev \
         libffi-dev \
-    && echo 'gem: --no-document' >> /etc/gemrc \
-    && gem install fluent-plugin-secure-forward \
-    && gem install fluent-plugin-record-reformer \
-    && gem install fluent-plugin-detect-exceptions -v 0.0.9 \
-    && gem install aws-sdk-core -v 2.10.50 \
-    && gem install fluent-plugin-cloudwatch-logs -v 0.4.0 \
-    && gem install fluent-plugin-kubernetes_metadata_filter \
+    && bundle config silence_root_warning true \
+    && bundle install --gemfile=/fluentd/Gemfile --path=/fluentd/vendor/bundle \
     && apk del .build-deps \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

diff --git a/docker-image/v0.12/alpine-cloudwatch/Gemfile b/docker-image/v0.12/alpine-cloudwatch/Gemfile
@@ -0,0 +1,11 @@
+# AUTOMATICALLY GENERATED
+# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Gemfile.erb
+
+source "https://rubygems.org"
+
+gem "fluentd", "0.12.33"
+gem "fluent-plugin-secure-forward"
+gem "fluent-plugin-record-reformer"
+gem "aws-sdk-core", "2.10.50"
+gem "fluent-plugin-cloudwatch-logs", "0.4.0"
+gem "fluent-plugin-kubernetes_metadata_filter"
diff --git a/docker-image/v0.12/alpine-cloudwatch/Gemfile.lock b/docker-image/v0.12/alpine-cloudwatch/Gemfile.lock
@@ -0,0 +1,104 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (5.1.6)
+      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-sdk-core (2.10.50)
+      aws-sigv4 (~> 1.0)
+      jmespath (~> 1.0)
+    aws-sigv4 (1.0.2)
+    concurrent-ruby (1.0.5)
+    cool.io (1.5.3)
+    domain_name (0.5.20170404)
+      unf (>= 0.0.5, < 1.0.0)
+    fluent-mixin-config-placeholders (0.4.0)
+      fluentd
+      uuidtools (>= 2.1.5)
+    fluent-plugin-cloudwatch-logs (0.4.0)
+      aws-sdk-core (>= 2.0.7)
+      fluent-mixin-config-placeholders (>= 0.2.0)
+      fluentd
+    fluent-plugin-kubernetes_metadata_filter (1.0.1)
+      fluentd (>= 0.12.0)
+      kubeclient (~> 1.1.4)
+      lru_redux
+    fluent-plugin-record-reformer (0.9.1)
+      fluentd
+    fluent-plugin-secure-forward (0.4.5)
+      fluentd (>= 0.10.46)
+      proxifier
+      resolve-hostname
+    fluentd (0.12.33)
+      cool.io (>= 1.2.2, < 2.0.0)
+      http_parser.rb (>= 0.5.1, < 0.7.0)
+      json (>= 1.4.3)
+      msgpack (>= 0.5.11, < 2)
+      sigdump (~> 0.2.2)
+      string-scrub (>= 0.0.3, <= 0.0.5)
+      tzinfo (>= 1.0.0)
+      tzinfo-data (>= 1.0.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.0.0)
+      concurrent-ruby (~> 1.0)
+    jmespath (1.3.1)
+    json (2.1.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.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    minitest (5.11.3)
+    msgpack (1.2.4)
+    netrc (0.11.0)
+    proxifier (1.0.3)
+    public_suffix (3.0.2)
+    recursive-open-struct (1.0.0)
+    resolve-hostname (0.1.0)
+    rest-client (2.0.2)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    sigdump (0.2.4)
+    string-scrub (0.0.5)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    tzinfo-data (1.2018.4)
+      tzinfo (>= 1.0.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.5)
+    uuidtools (2.1.5)
+    yajl-ruby (1.3.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  aws-sdk-core (= 2.10.50)
+  fluent-plugin-cloudwatch-logs (= 0.4.0)
+  fluent-plugin-kubernetes_metadata_filter
+  fluent-plugin-record-reformer
+  fluent-plugin-secure-forward
+  fluentd (= 0.12.33)
+
+BUNDLED WITH
+   1.16.1
diff --git a/docker-image/v0.12/alpine-cloudwatch/entrypoint.sh b/docker-image/v0.12/alpine-cloudwatch/entrypoint.sh
@@ -10,4 +10,4 @@ if [ -z ${FLUENT_ELASTICSEARCH_PASSWORD} ] ; then
    sed -i  '/FLUENT_ELASTICSEARCH_PASSWORD/d' /fluentd/etc/${FLUENTD_CONF}
 fi
 
-exec fluentd -c /fluentd/etc/${FLUENTD_CONF} -p /fluentd/plugins ${FLUENTD_OPT}
+exec fluentd -c /fluentd/etc/${FLUENTD_CONF} -p /fluentd/plugins --gemfile /fluentd/Gemfile ${FLUENTD_OPT}
diff --git a/docker-image/v0.12/alpine-elasticsearch/Dockerfile b/docker-image/v0.12/alpine-elasticsearch/Dockerfile
@@ -7,18 +7,16 @@ USER root
 WORKDIR /home/fluent
 ENV PATH /home/fluent/.gem/ruby/2.3.0/bin:$PATH
 
+COPY Gemfile* /fluentd/
 RUN set -ex \
-    && apk update && apk upgrade \
+    && apk upgrade --no-cache \
+    && apk add --no-cache ruby-bundler \
     && apk add --no-cache --virtual .build-deps \
         build-base \
         ruby-dev \
         libffi-dev \
-    && echo 'gem: --no-document' >> /etc/gemrc \
-    && gem install fluent-plugin-secure-forward \
-    && gem install fluent-plugin-record-reformer \
-    && gem install fluent-plugin-detect-exceptions -v 0.0.9 \
-    && gem install fluent-plugin-elasticsearch -v "<2" \
-    && gem install fluent-plugin-kubernetes_metadata_filter \
+    && bundle config silence_root_warning true \
+    && bundle install --gemfile=/fluentd/Gemfile --path=/fluentd/vendor/bundle \
     && apk del .build-deps \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

diff --git a/docker-image/v0.12/alpine-elasticsearch/Gemfile b/docker-image/v0.12/alpine-elasticsearch/Gemfile
@@ -0,0 +1,10 @@
+# AUTOMATICALLY GENERATED
+# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Gemfile.erb
+
+source "https://rubygems.org"
+
+gem "fluentd", "0.12.33"
+gem "fluent-plugin-secure-forward"
+gem "fluent-plugin-record-reformer"
+gem "fluent-plugin-elasticsearch"
+gem "fluent-plugin-kubernetes_metadata_filter"
diff --git a/docker-image/v0.12/alpine-elasticsearch/Gemfile.lock b/docker-image/v0.12/alpine-elasticsearch/Gemfile.lock
@@ -0,0 +1,107 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (5.1.6)
+      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)
+    concurrent-ruby (1.0.5)
+    cool.io (1.5.3)
+    domain_name (0.5.20170404)
+      unf (>= 0.0.5, < 1.0.0)
+    elasticsearch (6.0.2)
+      elasticsearch-api (= 6.0.2)
+      elasticsearch-transport (= 6.0.2)
+    elasticsearch-api (6.0.2)
+      multi_json
+    elasticsearch-transport (6.0.2)
+      faraday
+      multi_json
+    excon (0.62.0)
+    faraday (0.14.0)
+      multipart-post (>= 1.2, < 3)
+    fluent-plugin-elasticsearch (1.13.3)
+      elasticsearch
+      excon
+      fluentd (>= 0.12.10)
+    fluent-plugin-kubernetes_metadata_filter (1.0.1)
+      fluentd (>= 0.12.0)
+      kubeclient (~> 1.1.4)
+      lru_redux
+    fluent-plugin-record-reformer (0.9.1)
+      fluentd
+    fluent-plugin-secure-forward (0.4.5)
+      fluentd (>= 0.10.46)
+      proxifier
+      resolve-hostname
+    fluentd (0.12.33)
+      cool.io (>= 1.2.2, < 2.0.0)
+      http_parser.rb (>= 0.5.1, < 0.7.0)
+      json (>= 1.4.3)
+      msgpack (>= 0.5.11, < 2)
+      sigdump (~> 0.2.2)
+      string-scrub (>= 0.0.3, <= 0.0.5)
+      tzinfo (>= 1.0.0)
+      tzinfo-data (>= 1.0.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.0.0)
+      concurrent-ruby (~> 1.0)
+    json (2.1.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.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    minitest (5.11.3)
+    msgpack (1.2.4)
+    multi_json (1.13.1)
+    multipart-post (2.0.0)
+    netrc (0.11.0)
+    proxifier (1.0.3)
+    public_suffix (3.0.2)
+    recursive-open-struct (1.0.0)
+    resolve-hostname (0.1.0)
+    rest-client (2.0.2)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    sigdump (0.2.4)
+    string-scrub (0.0.5)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    tzinfo-data (1.2018.4)
+      tzinfo (>= 1.0.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.5)
+    yajl-ruby (1.3.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fluent-plugin-elasticsearch
+  fluent-plugin-kubernetes_metadata_filter
+  fluent-plugin-record-reformer
+  fluent-plugin-secure-forward
+  fluentd (= 0.12.33)
+
+BUNDLED WITH
+   1.16.1
diff --git a/docker-image/v0.12/alpine-elasticsearch/entrypoint.sh b/docker-image/v0.12/alpine-elasticsearch/entrypoint.sh
@@ -10,4 +10,4 @@ if [ -z ${FLUENT_ELASTICSEARCH_PASSWORD} ] ; then
    sed -i  '/FLUENT_ELASTICSEARCH_PASSWORD/d' /fluentd/etc/${FLUENTD_CONF}
 fi
 
-exec fluentd -c /fluentd/etc/${FLUENTD_CONF} -p /fluentd/plugins ${FLUENTD_OPT}
+exec fluentd -c /fluentd/etc/${FLUENTD_CONF} -p /fluentd/plugins --gemfile /fluentd/Gemfile ${FLUENTD_OPT}
diff --git a/docker-image/v0.12/alpine-gcs/Dockerfile b/docker-image/v0.12/alpine-gcs/Dockerfile
@@ -7,18 +7,16 @@ USER root
 WORKDIR /home/fluent
 ENV PATH /home/fluent/.gem/ruby/2.3.0/bin:$PATH
 
+COPY Gemfile* /fluentd/
 RUN set -ex \
-    && apk update && apk upgrade \
+    && apk upgrade --no-cache \
+    && apk add --no-cache ruby-bundler \
     && apk add --no-cache --virtual .build-deps \
         build-base \
         ruby-dev \
         libffi-dev \
-    && echo 'gem: --no-document' >> /etc/gemrc \
-    && gem install fluent-plugin-secure-forward \
-    && gem install fluent-plugin-record-reformer \
-    && gem install fluent-plugin-detect-exceptions -v 0.0.9 \
-    && gem install fluent-plugin-gcs -v "~> 0.3"  --no-document \
-    && gem install fluent-plugin-kubernetes_metadata_filter \
+    && bundle config silence_root_warning true \
+    && bundle install --gemfile=/fluentd/Gemfile --path=/fluentd/vendor/bundle \
     && apk del .build-deps \
     && gem sources --clear-all \
     && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem

diff --git a/docker-image/v0.12/alpine-gcs/Gemfile b/docker-image/v0.12/alpine-gcs/Gemfile
@@ -0,0 +1,10 @@
+# AUTOMATICALLY GENERATED
+# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Gemfile.erb
+
+source "https://rubygems.org"
+
+gem "fluentd", "0.12.33"
+gem "fluent-plugin-secure-forward"
+gem "fluent-plugin-record-reformer"
+gem "fluent-plugin-gcs", "~>0.3"
+gem "fluent-plugin-kubernetes_metadata_filter"