Merge branch 'master' into 6087-collection-timing

[arvados.git] / docker / build_tools / config.rb

diff --git a/docker/build_tools/config.rb b/docker/build_tools/config.rb
index 24d6ccb09864b1f42e84dd14925179ac4aa2c938..296bc206ff90560bdc0f16ab4d89887b89372623 100755 (executable)
--- a/docker/build_tools/config.rb
+++ b/docker/build_tools/config.rb
@@ -49,8 +49,6 @@ Dir.glob(globdir + '/*.in') do |template_file|
   output_path = File.join(generated_dir, File.basename(template_file, '.in'))
   output_mode = (File.stat(template_file).mode & 0100) ? 0755 : 0644
   File.open(output_path, "w", output_mode) do |output|
-    # Set the mode again after opening, to thwart any prevailing umask:
-    output.chmod output_mode
     File.open(template_file) do |input|
       input.each_line do |line|
 
@@ -74,12 +72,3 @@ Dir.glob(globdir + '/*.in') do |template_file|
     end
   end
 end
-
-# Copy the ssh public key file to base/generated (if a path is given)
-generated_dir = File.join('base/generated')
-Dir.mkdir(generated_dir) unless Dir.exists? generated_dir
-if (!config['PUBLIC_KEY_PATH'].nil? and
-    File.readable? config['PUBLIC_KEY_PATH'])
-  FileUtils.cp(config['PUBLIC_KEY_PATH'],
-               File.join(generated_dir, 'id_rsa.pub'))
-end