Skip to content

Non-fips Dockerfile.Signed-off-by: Abhay Sharma <[email protected]> #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shabhay wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Non-fips Dockerfile.Signed-off-by: Abhay Sharma <[email protected]> #26

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
199262d
Non-fips Dockerfile.Signed-off-by: Abhay Sharma <[email protected]>
shabhay Jun 15, 2022
783ef53
Updated Non-Fips Docker File.Signed-By:Abhay Sharma<[email protected]>
shabhay Jun 17, 2022
9ffb6df
Created seperate directory for Fips and photon docker files.Signed By:
shabhay Jun 21, 2022
f60a1b7
Reverting original DockerFile.Signed-By: Abhay
shabhay Jun 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .idea/.gitignore
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions .idea/fluent-plugin-vmware-log-intelligence.iml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 32 additions & 15 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,36 @@
FROM ruby:2.5
MAINTAINER [email protected]

RUN apt-get update && apt-get install -y \
build-essential \
nodejs

RUN mkdir -p /app

COPY ./ /app/
WORKDIR /app
FROM photon:3.0-20200424
Copy link
Contributor

@slk244 slk244 Jun 21, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets put this file inside new folder.
something like this nonfips/Dockerfile

Copy link
Contributor

@slk244 slk244 Jun 21, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add fips one as well in new directory
fips/Dockerfile

USER root
Copy link
Contributor

@slk244 slk244 Jun 21, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lets revert this file right?

Copy link
Author

@shabhay shabhay Jun 21, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes will revert it

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 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 /app
RUN rm -rf /fluentd/plugins/