From 199262d8eed0723567b3dba0a2520f2a290e2872 Mon Sep 17 00:00:00 2001 From: "Abhay Sharma (c)" Date: Wed, 15 Jun 2022 12:21:18 +0530 Subject: [PATCH 1/4] Non-fips Dockerfile.Signed-off-by: Abhay Sharma --- .idea/.gitignore | 8 +++ .../fluent-plugin-vmware-log-intelligence.iml | 11 +++++ .idea/modules.xml | 8 +++ .idea/vcs.xml | 6 +++ Dockerfile | 49 ++++++++++++++----- 5 files changed, 71 insertions(+), 11 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/fluent-plugin-vmware-log-intelligence.iml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/fluent-plugin-vmware-log-intelligence.iml b/.idea/fluent-plugin-vmware-log-intelligence.iml new file mode 100644 index 0000000..c3cd732 --- /dev/null +++ b/.idea/fluent-plugin-vmware-log-intelligence.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..da2729a --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 547b5cd..452ad46 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,46 @@ -FROM ruby:2.5 -MAINTAINER slk@vmware.com +FROM symphony-docker-local.artifactory.eng.vmware.com/vmware/lint-base-openjdk-11.0.13:photon-3.0-20220301-openjdk-11.0.13 -RUN apt-get update && apt-get install -y \ - build-essential \ - nodejs +USER root -RUN mkdir -p /app +RUN tdnf distro-sync --refresh -y \ + && tdnf install -y \ + rubygem-fluentd-1.6.3 \ + # Transitive dependencies of fluent-plugin-kubernetes_metadata_filter-2.2.0 + # that are not automatically picked for some reason + rubygem-concurrent-ruby-1.0.5 \ + rubygem-i18n-1.1.0 \ + # + # Optional but used by fluentd + rubygem-oj-3.3.10 \ + rubygem-async-http-0.48.2 \ + jemalloc-4.5.0 \ + # + # Fluentd plugins + rubygem-fluent-plugin-systemd-1.0.1 \ + rubygem-fluent-plugin-concat-2.4.0 \ + rubygem-fluent-plugin-kubernetes_metadata_filter-2.2.0 \ + rubygem-fluent-plugin-remote_syslog-1.0.0 -COPY ./ /app/ -WORKDIR /app -RUN gem build fluent-plugin-vmware-log-intelligence.gemspec +RUN echo "tdnf completed" +RUN gem install fluent-plugin-docker_metadata_filter -v 0.1.3 + +RUN gem install fluent-plugin-detect-exceptions -RUN gem install bundler && bundle install --jobs 20 --retry 5 +RUN gem install fluent-plugin-multi-format-parser + +RUN ln -s /usr/lib/ruby/gems/2.5.0/bin/fluentd /usr/bin/fluentd \ + && mkdir -p /fluentd/etc /fluentd/plugins \ + && fluentd --setup /fluentd/etc +RUN echo "copy plugins" +# Latest version of fluentd output plugins +COPY ./ /fluentd/plugins/ +WORKDIR /fluentd/plugins/ +RUN gem build fluent-plugin-vmware-log-intelligence.gemspec RUN gem install fluent-plugin-vmware-log-intelligence RUN gem list +RUN echo "gem list completed" +ENV LD_PRELOAD="/usr/lib/libjemalloc.so.2" WORKDIR / -RUN rm -rf /app \ No newline at end of file +RUN echo "workdir set" +RUN rm -rf /fluentd/plugins/ \ No newline at end of file From 783ef538abad7d35aa45a542a1c2246ae4823035 Mon Sep 17 00:00:00 2001 From: "Abhay Sharma (c)" Date: Fri, 17 Jun 2022 11:56:06 +0530 Subject: [PATCH 2/4] Updated Non-Fips Docker File.Signed-By:Abhay Sharma --- Dockerfile | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 452ad46..53241c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,5 @@ -FROM symphony-docker-local.artifactory.eng.vmware.com/vmware/lint-base-openjdk-11.0.13:photon-3.0-20220301-openjdk-11.0.13 - +FROM photon:3.0-20200424 USER root - RUN tdnf distro-sync --refresh -y \ && tdnf install -y \ rubygem-fluentd-1.6.3 \ @@ -20,27 +18,19 @@ RUN tdnf distro-sync --refresh -y \ rubygem-fluent-plugin-concat-2.4.0 \ rubygem-fluent-plugin-kubernetes_metadata_filter-2.2.0 \ rubygem-fluent-plugin-remote_syslog-1.0.0 - -RUN echo "tdnf completed" RUN gem install fluent-plugin-docker_metadata_filter -v 0.1.3 - RUN gem install fluent-plugin-detect-exceptions - RUN gem install fluent-plugin-multi-format-parser - RUN ln -s /usr/lib/ruby/gems/2.5.0/bin/fluentd /usr/bin/fluentd \ && mkdir -p /fluentd/etc /fluentd/plugins \ - && fluentd --setup /fluentd/etc -RUN echo "copy plugins" + && fluentd --setup /fluentd/etc \ + && rmdir /fluentd/etc/plugin # Latest version of fluentd output plugins COPY ./ /fluentd/plugins/ WORKDIR /fluentd/plugins/ RUN gem build fluent-plugin-vmware-log-intelligence.gemspec RUN gem install fluent-plugin-vmware-log-intelligence RUN gem list -RUN echo "gem list completed" ENV LD_PRELOAD="/usr/lib/libjemalloc.so.2" - WORKDIR / -RUN echo "workdir set" RUN rm -rf /fluentd/plugins/ \ No newline at end of file From 9ffb6df6dbf46c0a94022845792eeb6f40c4f188 Mon Sep 17 00:00:00 2001 From: "Abhay Sharma (c)" Date: Tue, 21 Jun 2022 11:50:59 +0530 Subject: [PATCH 3/4] Created seperate directory for Fips and photon docker files.Signed By: Abhay Sharma --- Fips/Dockerfile | 46 +++++++++++++++++++++++++++++++++++++++++++++ photonOS/Dockerfile | 36 +++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 Fips/Dockerfile create mode 100644 photonOS/Dockerfile diff --git a/Fips/Dockerfile b/Fips/Dockerfile new file mode 100644 index 0000000..452ad46 --- /dev/null +++ b/Fips/Dockerfile @@ -0,0 +1,46 @@ +FROM symphony-docker-local.artifactory.eng.vmware.com/vmware/lint-base-openjdk-11.0.13:photon-3.0-20220301-openjdk-11.0.13 + +USER root + +RUN tdnf distro-sync --refresh -y \ + && tdnf install -y \ + rubygem-fluentd-1.6.3 \ + # Transitive dependencies of fluent-plugin-kubernetes_metadata_filter-2.2.0 + # that are not automatically picked for some reason + rubygem-concurrent-ruby-1.0.5 \ + rubygem-i18n-1.1.0 \ + # + # Optional but used by fluentd + rubygem-oj-3.3.10 \ + rubygem-async-http-0.48.2 \ + jemalloc-4.5.0 \ + # + # Fluentd plugins + rubygem-fluent-plugin-systemd-1.0.1 \ + rubygem-fluent-plugin-concat-2.4.0 \ + rubygem-fluent-plugin-kubernetes_metadata_filter-2.2.0 \ + rubygem-fluent-plugin-remote_syslog-1.0.0 + +RUN echo "tdnf completed" +RUN gem install fluent-plugin-docker_metadata_filter -v 0.1.3 + +RUN gem install fluent-plugin-detect-exceptions + +RUN gem install fluent-plugin-multi-format-parser + +RUN ln -s /usr/lib/ruby/gems/2.5.0/bin/fluentd /usr/bin/fluentd \ + && mkdir -p /fluentd/etc /fluentd/plugins \ + && fluentd --setup /fluentd/etc +RUN echo "copy plugins" +# Latest version of fluentd output plugins +COPY ./ /fluentd/plugins/ +WORKDIR /fluentd/plugins/ +RUN gem build fluent-plugin-vmware-log-intelligence.gemspec +RUN gem install fluent-plugin-vmware-log-intelligence +RUN gem list +RUN echo "gem list completed" +ENV LD_PRELOAD="/usr/lib/libjemalloc.so.2" + +WORKDIR / +RUN echo "workdir set" +RUN rm -rf /fluentd/plugins/ \ No newline at end of file diff --git a/photonOS/Dockerfile b/photonOS/Dockerfile new file mode 100644 index 0000000..53241c0 --- /dev/null +++ b/photonOS/Dockerfile @@ -0,0 +1,36 @@ +FROM photon:3.0-20200424 +USER root +RUN tdnf distro-sync --refresh -y \ + && tdnf install -y \ + rubygem-fluentd-1.6.3 \ + # Transitive dependencies of fluent-plugin-kubernetes_metadata_filter-2.2.0 + # that are not automatically picked for some reason + rubygem-concurrent-ruby-1.0.5 \ + rubygem-i18n-1.1.0 \ + # + # Optional but used by fluentd + rubygem-oj-3.3.10 \ + rubygem-async-http-0.48.2 \ + jemalloc-4.5.0 \ + # + # Fluentd plugins + rubygem-fluent-plugin-systemd-1.0.1 \ + rubygem-fluent-plugin-concat-2.4.0 \ + rubygem-fluent-plugin-kubernetes_metadata_filter-2.2.0 \ + rubygem-fluent-plugin-remote_syslog-1.0.0 +RUN gem install fluent-plugin-docker_metadata_filter -v 0.1.3 +RUN gem install fluent-plugin-detect-exceptions +RUN gem install fluent-plugin-multi-format-parser +RUN ln -s /usr/lib/ruby/gems/2.5.0/bin/fluentd /usr/bin/fluentd \ + && mkdir -p /fluentd/etc /fluentd/plugins \ + && fluentd --setup /fluentd/etc \ + && rmdir /fluentd/etc/plugin +# Latest version of fluentd output plugins +COPY ./ /fluentd/plugins/ +WORKDIR /fluentd/plugins/ +RUN gem build fluent-plugin-vmware-log-intelligence.gemspec +RUN gem install fluent-plugin-vmware-log-intelligence +RUN gem list +ENV LD_PRELOAD="/usr/lib/libjemalloc.so.2" +WORKDIR / +RUN rm -rf /fluentd/plugins/ \ No newline at end of file From f60a1b74ae5faeeee93dbccbcd41293a67a61506 Mon Sep 17 00:00:00 2001 From: "Abhay Sharma (c)" Date: Tue, 21 Jun 2022 15:10:10 +0530 Subject: [PATCH 4/4] Reverting original DockerFile.Signed-By: Abhay Sharma --- Dockerfile | 47 +++++++++++++++-------------------------------- 1 file changed, 15 insertions(+), 32 deletions(-) diff --git a/Dockerfile b/Dockerfile index 53241c0..547b5cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,36 +1,19 @@ -FROM photon:3.0-20200424 -USER root -RUN tdnf distro-sync --refresh -y \ - && tdnf install -y \ - rubygem-fluentd-1.6.3 \ - # Transitive dependencies of fluent-plugin-kubernetes_metadata_filter-2.2.0 - # that are not automatically picked for some reason - rubygem-concurrent-ruby-1.0.5 \ - rubygem-i18n-1.1.0 \ - # - # Optional but used by fluentd - rubygem-oj-3.3.10 \ - rubygem-async-http-0.48.2 \ - jemalloc-4.5.0 \ - # - # Fluentd plugins - rubygem-fluent-plugin-systemd-1.0.1 \ - rubygem-fluent-plugin-concat-2.4.0 \ - rubygem-fluent-plugin-kubernetes_metadata_filter-2.2.0 \ - rubygem-fluent-plugin-remote_syslog-1.0.0 -RUN gem install fluent-plugin-docker_metadata_filter -v 0.1.3 -RUN gem install fluent-plugin-detect-exceptions -RUN gem install fluent-plugin-multi-format-parser -RUN ln -s /usr/lib/ruby/gems/2.5.0/bin/fluentd /usr/bin/fluentd \ - && mkdir -p /fluentd/etc /fluentd/plugins \ - && fluentd --setup /fluentd/etc \ - && rmdir /fluentd/etc/plugin -# Latest version of fluentd output plugins -COPY ./ /fluentd/plugins/ -WORKDIR /fluentd/plugins/ +FROM ruby:2.5 +MAINTAINER slk@vmware.com + +RUN apt-get update && apt-get install -y \ + build-essential \ + nodejs + +RUN mkdir -p /app + +COPY ./ /app/ +WORKDIR /app RUN gem build fluent-plugin-vmware-log-intelligence.gemspec + +RUN gem install bundler && bundle install --jobs 20 --retry 5 RUN gem install fluent-plugin-vmware-log-intelligence RUN gem list -ENV LD_PRELOAD="/usr/lib/libjemalloc.so.2" + WORKDIR / -RUN rm -rf /fluentd/plugins/ \ No newline at end of file +RUN rm -rf /app \ No newline at end of file