Skip to content
This repository has been archived by the owner on Oct 30, 2019. It is now read-only.

Updating Dockerfile template to use same factfile name as supplied #64

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

Updating Dockerfile template to use same factfile name as supplied #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
50615c1
Updating Dockerfile template to place the factfile using the same fil…
avidspartan1 Jan 18, 2019
fef4fe1
Fixing spacing
avidspartan1 Jan 18, 2019
a487a4f
Fixing deprecated rubocop styles
avidspartan1 Jan 18, 2019
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
5 changes: 4 additions & 1 deletion .rubocop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,10 @@ Style/StringLiterals:
Style/TrailingCommaInArguments:
Enabled: True

Style/TrailingCommaInLiteral:
Style/TrailingCommaInArrayLiteral:
Enabled: True

Style/TrailingCommaInHashLiteral:
Enabled: True

Style/GlobalVars:
Expand Down
2 changes: 1 addition & 1 deletion templates/Dockerfile.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ RUN rm /usr/lib/ruby/gems/2.3.0/gems/facter-"$FACTER_VERSION"/lib/facter/blockde
<% end %>

<% if use_factfile %>
COPY <%= factfile %> /etc/puppetlabs/facter/facts.d/custom_facts.txt
COPY <%= factfile %> /etc/puppetlabs/facter/facts.d/<%= factfile.split('/')[-1] %>
<% end %>

<% if use_puppetfile && !master %>
Expand Down