load local env. file for secrets.

diff --git a/cookbooks/screwdriver/recipes/docker-compose.rb b/cookbooks/screwdriver/recipes/docker-compose.rb
index eeb9392..1a6cbef 100644 (file)
--- a/cookbooks/screwdriver/recipes/docker-compose.rb
+++ b/cookbooks/screwdriver/recipes/docker-compose.rb
@@ -222,18 +222,21 @@ end
 =end
 
 db_username = nil
+db_username = env_local['DATASTORE_SEQUELIZE_USERNAME'] if !env_local.nil? && !env_local['DATASTORE_SEQUELIZE_USERNAME'].nil?
 db_username_vault_item = node['screwdriver']['db_username_vault_item']
 db_username = get_vault_item_value(db_username_vault_item) unless db_username_vault_item.empty?
 db_username = 'sd-admin' if db_username.nil?
 api_envs['DATASTORE_SEQUELIZE_USERNAME'] = '${DB_USERNAME}'
 
 db_password = nil
+db_password = env_local['DATASTORE_SEQUELIZE_PASSWORD'] if !env_local.nil? && !env_local['DATASTORE_SEQUELIZE_PASSWORD'].nil?
 db_password_vault_item = node['screwdriver']['db_password_vault_item']
 db_password = get_vault_item_value(db_password_vault_item) unless db_password_vault_item.empty?
 db_password = SecureRandom.urlsafe_base64(32) if db_password.nil?
 api_envs['DATASTORE_SEQUELIZE_PASSWORD'] = '${DB_PASSWORD}'
 
 db_root_password = nil
+db_root_password = env_local['DB_ROOT_PASSWORD'] if !env_local.nil? && !env_local['DB_ROOT_PASSWORD'].nil?
 db_root_password_vault_item = node['screwdriver']['db_root_password_vault_item']
 db_root_password = get_vault_item_value(db_root_password_vault_item) unless db_root_password_vault_item.empty?
 db_root_password = SecureRandom.urlsafe_base64(32) if db_root_password.nil?
@@ -322,12 +325,14 @@ else
 end
 
 s3_access_key_id = nil
+s3_access_key_id = env_local['S3_ACCESS_KEY_ID'] if !env_local.nil? && !env_local['S3_ACCESS_KEY_ID'].nil?
 s3_access_key_id_vault_item = node['screwdriver']['s3_access_key_id_vault_item']
 s3_access_key_id = get_vault_item_value(s3_access_key_id_vault_item) unless s3_access_key_id_vault_item.empty?
 s3_access_key_id = SecureRandom.urlsafe_base64(16) if s3_access_key_id.nil?
 store_envs['S3_ACCESS_KEY_ID'] = '${S3_ACCESS_KEY_ID}'
 
 s3_access_key_secret = nil
+s3_access_key_secret = env_local['S3_ACCESS_KEY_SECRET'] if !env_local.nil? && !env_local['S3_ACCESS_KEY_SECRET'].nil?
 s3_access_key_secret_vault_item = node['screwdriver']['s3_access_key_secret_vault_item']
 s3_access_key_secret = get_vault_item_value(s3_access_key_secret_vault_item) unless s3_access_key_secret_vault_item.empty?
 s3_access_key_secret = SecureRandom.urlsafe_base64(32) if s3_access_key_secret.nil?