Merge branch 'waipeng-master'

Author: garethr

.rubocop.yml

@@ -51,6 +51,9 @@ Lint/AssignmentInCondition:
 Layout/IndentHeredoc:
   Enabled: false
 
+Naming/HeredocDelimiterNaming:
+   Enabled: false
+
 Layout/SpaceBeforeComment:
   Enabled: True
 
@@ -122,7 +125,7 @@ Lint/Void:
 Layout/AccessModifierIndentation:
   Enabled: True
 
-Style/AccessorMethodName:
+Naming/AccessorMethodName:
   Enabled: True
 
 Style/Alias:
@@ -158,7 +161,7 @@ Layout/CaseIndentation:
 Style/CharacterLiteral:
   Enabled: True
 
-Style/ClassAndModuleCamelCase:
+Naming/ClassAndModuleCamelCase:
   Enabled: True
 
 Style/ClassAndModuleChildren:
@@ -256,7 +259,7 @@ Style/CommentAnnotation:
 Metrics/CyclomaticComplexity:
   Enabled: False
 
-Style/ConstantName:
+Naming/ConstantName:
   Enabled: True
 
 Style/Documentation:
@@ -365,7 +368,7 @@ Style/UnlessElse:
 Style/VariableInterpolation:
   Enabled: True
 
-Style/VariableName:
+Naming/VariableName:
   Enabled: True
 
 Style/WhileUntilDo:
@@ -374,7 +377,7 @@ Style/WhileUntilDo:
 Style/EvenOdd:
   Enabled: True
 
-Style/FileName:
+Naming/FileName:
   Enabled: False
 
 Style/For:
@@ -383,7 +386,7 @@ Style/For:
 Style/Lambda:
   Enabled: True
 
-Style/MethodName:
+Naming/MethodName:
   Enabled: True
 
 Style/MultilineTernaryOperator:
@@ -419,7 +422,7 @@ Style/NumericLiterals:
 Style/OneLineConditional:
   Enabled: True
 
-Style/OpMethod:
+Naming/BinaryOperatorParameter:
   Enabled: True
 
 Style/ParenthesesAroundCondition:
@@ -431,7 +434,7 @@ Style/PercentLiteralDelimiters:
 Style/PerlBackrefs:
   Enabled: True
 
-Style/PredicateName:
+Naming/PredicateName:
   Enabled: True
 
 Style/RedundantException:

README.md

@@ -270,10 +270,16 @@ First install the dependent modules into the local environment:
 
     r10k puppetfile install --moduledir code/environments/production/modules
 
+Create an `autosign.conf` file with the following:
+
+```
+*.dockerbuilder.*
+```
+
 Then, from the `examples/master` folder, use Docker to run an instance
 of Puppet Server:
 
-    docker run --name puppet -P --hostname puppet -v $(pwd)/code:/etc/puppetlabs/code puppet/puppetserver-standalone
+    docker run --name puppet -P --hostname puppet -v $(pwd)/code:/etc/puppetlabs/code -v $(pwd)/autosign.conf:/etc/puppetlabs/puppet/autosign.conf puppet/puppetserver-standalone
 
 Determine the port on which the Puppet Server is exposed locally:
 
@@ -286,9 +292,6 @@ and {port} in the following with your own values.
 
 This should use the code on the Puppet Master to build the image.
 
-Note that this currently assumes the requested certificate is autosigned
-in some way, expect more guidance on that in the future.
-
 
 ### Minimizing image size with Rocker
 

lib/puppet_x/puppetlabs/imagebuilder.rb

@@ -219,7 +219,9 @@ def determine_environment_vars
                      end
         when 'debian'
           codename = case @context[:os_version]
-                     when 'latest', 'stable', 'stable-slim', 'stable-backports', 'jessie', 'jessie-slim', 'jessie-backports', %r{^8}
+                     when 'latest', 'stable', 'stable-slim', 'stable-backports', 'stretch', 'stretch-slim', 'stretch-backports', %r{^9}
+                       'stretch'
+                     when 'oldstable', 'oldstable-slim', 'oldstable-backports', 'jessie', 'jessie-slim', 'jessie-backports', %r{^8}
                        'jessie'
                      when 'sid', 'sid-slim'
                        'sid'
@@ -281,7 +283,7 @@ def determine_environment_vars
       end
 
       def determine_repository_details
-        puppet5 = @context[:puppet_agent_version].to_f >= 5 ? true : false
+        puppet5 = @context[:puppet_agent_version].to_f >= 5
         @context[:package_address], @context[:package_name] = case @context[:os]
                                                               when 'ubuntu', 'debian'
                                                                 if puppet5
@@ -366,8 +368,12 @@ def apt_proxy_string
         @context[:apt_proxy].nil? ? '' : "--build-arg APT_PROXY=#{@context[:apt_proxy]}"
       end
 
+      def squash_string
+        @context[:squash] ? '--squash' : ''
+      end
+
       def command_build_args
-        "#{autosign_string} #{apt_proxy_string} #{http_proxy_string} #{https_proxy_string} #{string_args}"
+        "#{autosign_string} #{apt_proxy_string} #{http_proxy_string} #{https_proxy_string} #{string_args} #{squash_string}"
       end
 
       def docker_network

lib/puppet_x/puppetlabs/imagebuilder_face.rb

@@ -30,6 +30,11 @@ class ImageBuilder::Face < Puppet::Face
         default_to { '2.5.5' }
       end
 
+      option '--r10k-yaml BOOLEAN' do
+        summary 'When yes, copies the r10k.yaml file to the container before running r10k'
+        default_to { false }
+      end
+
       option '--module-path PATH' do
         summary 'A path to a directory containing a set of modules to be copied into the image'
       end
@@ -124,6 +129,11 @@ class ImageBuilder::Face < Puppet::Face
         summary 'Pass the debug flag to the Puppet process used to build the container image'
         default_to { false }
       end
+
+      option '--squash' do
+        summary 'Automatically squash all layers in the generated image'
+        default_to { false }
+      end
     end
   end
 end

spec/support/examples/imagebuilder.rb

@@ -593,6 +593,7 @@
       '12.04' => 'precise'
     },
     debian: {
+      '9' => 'stretch',
       '8' => 'jessie',
       '7' => 'wheezy'
     }

templates/Dockerfile.erb

@@ -75,6 +75,9 @@ RUN apk add --update git && \
     <%= gem_path %> install r10k:"$R10K_VERSION" --no-ri --no-rdoc && \
     rm -rf /var/cache/apk/*
 <% end %>
+<% if r10k_yaml %>
+COPY r10k.yaml /r10k.yaml
+<% end %>
 COPY <%= puppetfile %> /Puppetfile
 RUN <%= r10k_path %> puppetfile install --moduledir /etc/puppetlabs/code/modules
 <% end %>