4027: Bugfix update-gitolite.rb in Docker.

* Load a YAML library.

* Support ARVADOS_API_HOST_INSECURE, and set it in normal Docker use.

diff --git a/docker/api/arvados-clients.yml.in b/docker/api/arvados-clients.yml.in
index babfc4e5c98ea2af0e761cfe2f141d295d0e25cf..59ff352a1889a5edc3fcd7fe27343e889c772231 100644 (file)
--- a/docker/api/arvados-clients.yml.in
+++ b/docker/api/arvados-clients.yml.in
@@ -3,3 +3,4 @@ production:
   gitolite_tmp: 'gitolite-tmp'
   arvados_api_host: 'api'
   arvados_api_token: '@@API_SUPERUSER_SECRET@@'
+  arvados_api_host_insecure: true

diff --git a/docker/api/update-gitolite.rb b/docker/api/update-gitolite.rb
index 779099aac83cf88e2892178da47fa9ca9e39b735..2c46a0d0b5a3c71b8989df9e1c80909fce2830ec 100755 (executable)
--- a/docker/api/update-gitolite.rb
+++ b/docker/api/update-gitolite.rb
@@ -4,6 +4,7 @@ require 'rubygems'
 require 'pp'
 require 'arvados'
 require 'active_support/all'
+require 'yaml'
 
 # This script does the actual gitolite config management on disk.
 #
@@ -34,6 +35,11 @@ gitolite_admin = File.join(File.expand_path(File.dirname(__FILE__)) + '/' + gito
 
 ENV['ARVADOS_API_HOST'] = cp_config['arvados_api_host']
 ENV['ARVADOS_API_TOKEN'] = cp_config['arvados_api_token']
+if cp_config['arvados_api_host_insecure']
+  ENV['ARVADOS_API_HOST_INSECURE'] = 'true'
+else
+  ENV.delete('ARVADOS_API_HOST_INSECURE')
+end
 
 keys = ''