Signed-off-by: Li Yuanchao lyc163mail@163.com --- container/defconfig.rb | 1 + container/register-accounts/start | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/container/defconfig.rb b/container/defconfig.rb index f090351..0a8e4d5 100755 --- a/container/defconfig.rb +++ b/container/defconfig.rb @@ -11,6 +11,7 @@ def cci_defaults '/etc/compass-ci/service/*.yaml', '/etc/compass-ci/accounts/*.yaml', '/etc/compass-ci/register/*.yaml', + '/etc/compass-ci/*.yaml', "#{ENV['HOME']}/.config/compass-ci/defaults/*.yaml"]).each do |file| hash.update YAML.load_file(file) || {} end diff --git a/container/register-accounts/start b/container/register-accounts/start index c2acc75..ad70048 100755 --- a/container/register-accounts/start +++ b/container/register-accounts/start @@ -9,6 +9,8 @@ require_relative '../defconfig.rb' names = Set.new %w[ ES_HOST ES_PORT + ES_USER + ES_PASSWORD lab ]
@@ -25,7 +27,7 @@ cmd = %w[ ] + env + %W[ -e CCI_SRC=#{DEFAULT_CCI} -v #{ENV['CCI_SRC']}:#{DEFAULT_CCI} - -v /etc/compass-ci/register:/etc/compass-ci/register:ro + -v /etc/compass-ci:/etc/compass-ci:ro -v /etc/localtime:/etc/localtime:ro -w #{DEFAULT_CCI}/container/register-accounts register-accounts