security fix (#77)

Author: rockb1017

.circleci/build_and_push_to_dockerhub.sh

@@ -6,7 +6,7 @@ echo "Copying licenses to be included in the docker image..."
 mkdir docker/licenses
 cp -rp LICENSE docker/licenses/
 VERSION=`cat VERSION`
-docker build --build-arg VERSION=$VERSION --no-cache -t splunk/fluent-plugin-kubernetes-metrics:ci ./docker
+docker build --no-cache --pull --build-arg VERSION=$VERSION --no-cache -t splunk/fluent-plugin-kubernetes-metrics:ci ./docker
 docker tag splunk/fluent-plugin-kubernetes-metrics:ci splunk/${DOCKERHUB_REPO_NAME}:${VERSION}
 docker tag splunk/fluent-plugin-kubernetes-metrics:ci splunk/${DOCKERHUB_REPO_NAME}:latest
 echo "Push docker image to splunk dockerhub..."

.gitignore

@@ -5,5 +5,6 @@ coverage/
 .idea/
 docker/gems/
 docker/licenses/
+docker/gem/
 /.bundle/
 docker/.bundle/

CONTRIBUTORS.md

@@ -2,7 +2,7 @@
 
 Fluentd Plugin for Kubernetes Metrics is developed by Splunkers and the open-source community.
 
-We thank all of our [contributors](https://github.com/splunk/fluent-plugin-kubernetes-objects/graphs/contributors)!
+We thank all of our [contributors](https://github.com/splunk/fluent-plugin-kubernetes-metrics/graphs/contributors)!
 
 **For the detailed history of contributions** of a given file, try
 

Gemfile.lock

@@ -3,7 +3,6 @@ PATH
   specs:
     fluent-plugin-kubernetes-metrics (1.1.3)
       fluentd (~> 1.9.1)
-      http_parser.rb (= 0.5.3)
       kubeclient (~> 4.6.0)
       multi_json (~> 1.14.1)
       oj (~> 3.10.2)
@@ -61,7 +60,7 @@ GEM
     oj (3.10.2)
     power_assert (1.1.3)
     public_suffix (3.0.3)
-    rake (12.3.2)
+    rake (13.0.1)
     recursive-open-struct (1.1.0)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
@@ -99,7 +98,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 2.0)
   fluent-plugin-kubernetes-metrics!
-  rake (~> 12.0)
+  rake (~> 13.0)
   simplecov (~> 0.16.1)
   test-unit (~> 3.3.0)
   webmock (~> 3.5.1)

Makefile

@@ -0,0 +1,21 @@
+VERSION := $(shell sh -c 'cat VERSION')
+
+clean: 
+	@rm -rf pkg/* docker/gem/ docker/gems/ docker/*.gem docker/licenses
+
+build: clean 
+	@bundle exec rake build
+
+docker: build install-deps
+	@cp pkg/fluent-plugin-*.gem docker
+	@mkdir -p docker/licenses
+	@cp -rp LICENSE docker/licenses/
+	@docker build --no-cache --pull --build-arg VERSION=$(VERSION) -t splunk/k8s-metrics:$(VERSION) ./docker
+
+unit-test:
+	@bundle exec rake test
+
+install-deps:
+	@gem install bundler
+	@bundle update --bundler
+	@bundle install

Rakefile

@@ -24,6 +24,6 @@ namespace :docker do
     raise 'Argument `tag` was not provided.' unless args.tag
 
     cp Dir['pkg/fluent-plugin-kubernetes-metrics-*.gem'], 'docker/'
-    sh "docker build --build-arg VERSION=$(cat VERSION) --no-cache -t splunk/connect-for-kubernetes:#{args.tag} ./docker"
+    sh "docker build --no-cache --pull --build-arg VERSION=$(cat VERSION) --no-cache -t splunk/connect-for-kubernetes:#{args.tag} ./docker"
   end
 end

docker/Dockerfile

@@ -1,7 +1,5 @@
 FROM registry.access.redhat.com/ubi8/ruby-25
 
-MAINTAINER DataEdge [email protected]
-
 ARG VERSION
 
 LABEL name="Splunk Connect for Kubernetes Metrics container" \
@@ -22,13 +20,13 @@ COPY licenses /licenses
 
 COPY Gemfile* ./
 RUN gem install bundler \
-   && bundle install \
-   && bundle exec gem install /tmp/*.gem
+   && gem unpack /tmp/*.gem --target gem \
+   && bundle install
 
 RUN groupadd -r $FLUENT_USER && \
   useradd -r -g $FLUENT_USER $FLUENT_USER && \
-  mkdir -p /fluentd/log fluentd/etc /fluentd/plugins &&\
+  mkdir -p /fluentd/log /fluentd/etc /fluentd/plugins && \
   chown -R $FLUENT_USER /fluentd && chgrp -R $FLUENT_USER /fluentd
 
 USER $FLUENT_USER
-CMD exec fluentd -c /fluentd/etc/fluent.conf
+CMD bundle exec fluentd -c /fluentd/etc/fluent.conf

docker/Gemfile

@@ -14,4 +14,5 @@ gem 'bigdecimal', '=2.0.0'
 gem 'kubeclient', '=4.6.0'
 gem 'http_parser.rb', '=0.5.3'
 
-gem "fluent-plugin-splunk-hec", "= 1.2.1"
+gem "fluent-plugin-splunk-hec", "~> 1.2"
+gem 'fluent-plugin-kubernetes-metrics', path: 'gem/'

docker/Gemfile.lock

@@ -1,9 +1,9 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.4.1)
-      activesupport (= 5.2.4.1)
-    activesupport (5.2.4.1)
+    activemodel (5.2.4.3)
+      activesupport (= 5.2.4.3)
+    activesupport (5.2.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)