change plugin install

Author: rockb1017

.circleci/build_and_push_to_dockerhub.sh

@@ -1,12 +1,8 @@
 #!/usr/bin/env bash
 set -e
-echo "Building docker image..."
-cp /tmp/pkg/fluent-plugin-kubernetes-metrics-*.gem docker
-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 --build-arg VERSION=$VERSION --no-cache -t splunk/fluent-plugin-kubernetes-metrics:ci -f docker/Dockerfile .
 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..."

Rakefile

@@ -23,7 +23,6 @@ namespace :docker do
   task :build, [:tag] => :build do |_t, args|
     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 --build-arg VERSION=$(cat VERSION) --no-cache -t splunk/connect-for-kubernetes:#{args.tag} -f docker/Dockerfile ."
   end
 end

docker/Dockerfile

@@ -17,18 +17,18 @@ ENV FLUENT_USER fluent
 
 USER root
 
-COPY *.gem /tmp/
-COPY licenses /licenses
+COPY lib/fluent/plugin/*.rb /tmp/
+COPY LICENSE /licenses/
 
-COPY Gemfile* ./
+COPY docker/Gemfile* ./
 RUN gem install bundler \
-   && bundle install \
-   && bundle exec gem install /tmp/*.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 && \
+  cp /tmp/*.rb /fluentd/plugins/ && \
   chown -R $FLUENT_USER /fluentd && chgrp -R $FLUENT_USER /fluentd
 
 USER $FLUENT_USER
-CMD exec fluentd -c /fluentd/etc/fluent.conf
+CMD exec fluentd -p /fluentd/plugins -c /fluentd/etc/fluent.conf

docker/README.md

@@ -1,4 +1,4 @@
 # Docker Image for Splunk Connect for Kubernetes
 Fluentd with input plugin for k8s metrics
 # To Build
-`docker build --build-arg VERSION=$(cat VERSION) --no-cache -t splunk/fluent-plugin-kubernetes-metrics:ci ./docker`
+`docker build --build-arg VERSION=$(cat VERSION) --no-cache -t splunk/splunk/k8s-metrics:local -f docker/Dockerfile .`

docker/build.sh

@@ -2,18 +2,6 @@
 set -e
 TAG=$1
 
-# Install dependecies
-gem install bundler
-bundle update --bundler
-bundle install
-
-# Build Gem
-bundle exec rake build -t -v
-cp pkg/fluent-plugin-kubernetes-metrics-*.gem docker
-
 # Build Docker Image
 VERSION=`cat VERSION`
-echo "Copying licenses to be included in the docker image..."
-mkdir -p docker/licenses
-cp -rp LICENSE docker/licenses/
-docker build --build-arg VERSION=$VERSION --no-cache -t splunk/k8s-metrics:$TAG ./docker
+docker build --build-arg VERSION=$VERSION --no-cache -t splunk/k8s-metrics:$TAG -f docker/Dockerfile .