X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a452ab111d29f4f06d31c3fe760bb17b211020a6..78ddad37d72c6c3a728530dc6932fb91f7d81b87:/docker/build_tools/build.rb?ds=sidebyside

diff --git a/docker/build_tools/build.rb b/docker/build_tools/build.rb
index cda8651148..e3309a9229 100755
--- a/docker/build_tools/build.rb
+++ b/docker/build_tools/build.rb
@@ -51,41 +51,40 @@ def main options
   # Generate a config.yml if it does not exist or is empty
   if not File.size? 'config.yml'
     print "Generating config.yml.\n"
-    print "Arvados needs to know the email address of the administrative user,\n"
-    print "so that when that user logs in they are automatically made an admin.\n"
-    print "This should be an email address associated with a Google account.\n"
-    print "\n"
-    admin_email_address = ""
-    until is_valid_email? admin_email_address
-      print "Enter your Google ID email address here: "
-      admin_email_address = gets.strip
-      if not is_valid_email? admin_email_address
-        print "That doesn't look like a valid email address. Please try again.\n"
-      end
-    end
-
-    print "Arvados needs to know the shell login name for the administrative user.\n"
-    print "This will also be used as the name for your git repository.\n"
-    print "\n"
-    user_name = ""
-    until is_valid_user_name? user_name
-      print "Enter a shell login name here: "
-      user_name = gets.strip
-      if not is_valid_user_name? user_name
-        print "That doesn't look like a valid shell login name. Please try again.\n"
-      end
-    end
+    # print "Arvados needs to know the email address of the administrative user,\n"
+    # print "so that when that user logs in they are automatically made an admin.\n"
+    # print "This should be an email address associated with a Google account.\n"
+    # print "\n"
+    # admin_email_address = ""
+    # until is_valid_email? admin_email_address
+    #   print "Enter your Google ID email address here: "
+    #   admin_email_address = gets.strip
+    #   if not is_valid_email? admin_email_address
+    #     print "That doesn't look like a valid email address. Please try again.\n"
+    #   end
+    # end
+
+    # print "Arvados needs to know the shell login name for the administrative user.\n"
+    # print "This will also be used as the name for your git repository.\n"
+    # print "\n"
+    # user_name = ""
+    # until is_valid_user_name? user_name
+    #   print "Enter a shell login name here: "
+    #   user_name = gets.strip
+    #   if not is_valid_user_name? user_name
+    #     print "That doesn't look like a valid shell login name. Please try again.\n"
+    #   end
+    # end
 
     File.open 'config.yml', 'w' do |config_out|
       config_out.write "# If a _PW or _SECRET variable is set to an empty string, a password\n"
       config_out.write "# will be chosen randomly at build time. This is the\n"
       config_out.write "# recommended setting.\n\n"
       config = YAML.load_file 'config.yml.example'
-      config['API_AUTO_ADMIN_USER'] = admin_email_address
-      config['ARVADOS_USER_NAME'] = user_name
+      #config['API_AUTO_ADMIN_USER'] = admin_email_address
+      #config['ARVADOS_USER_NAME'] = user_name
       config['API_HOSTNAME'] = generate_api_hostname
-      config['API_WORKBENCH_ADDRESS'] = 'http://localhost:9899'
-      config['PUBLIC_KEY_PATH'] = find_or_create_ssh_key(config['API_HOSTNAME'])
+      config['API_WORKBENCH_ADDRESS'] = 'false'
       config.each_key do |var|
         config_out.write "#{var}: #{config[var]}\n"
       end
@@ -166,22 +165,6 @@ def docker_ok?(docker_path)
   return system "#{docker_path} images > /dev/null 2>&1"
 end
 
-# find_or_create_ssh_key arvados_name
-#   Returns the SSH public key appropriate for this Arvados instance,
-#   generating one if necessary.
-#
-def find_or_create_ssh_key arvados_name
-  ssh_key_file = "#{ENV['HOME']}/.ssh/arvados_#{arvados_name}_id_rsa"
-  unless File.exists? ssh_key_file
-    system 'ssh-keygen',
-           '-f', ssh_key_file,
-           '-C', "arvados@#{arvados_name}",
-           '-P', ''
-  end
-
-  return "#{ssh_key_file}.pub"
-end
-
 # install_docker
 #   Determines which Docker package is suitable for this Linux distro
 #   and installs it, resolving any dependencies.