Signed-off-by: Luan Shengde luanshengde2@huawei.com --- container/send-internet-mail/start | 74 ++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100755 container/send-internet-mail/start
diff --git a/container/send-internet-mail/start b/container/send-internet-mail/start new file mode 100755 index 0000000..1ce17bf --- /dev/null +++ b/container/send-internet-mail/start @@ -0,0 +1,74 @@ +#!/usr/bin/env ruby +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +# frozen_string_literal: true + +require 'set' +require_relative '../defconfig' + +docker_rm 'send-internet-mail' + +names = Set.new %w[ + ROBOT_EMAIL_ADDRESS_INTERNET + ROBOT_EMAIL_PASSWORD_INTERNET + SEND_MAIL_PORT_INTERNET +] + +defaults = relevant_defaults(names) + +ROBOT_EMAIL_ADDRESS = defaults['ROBOT_EMAIL_ADDRESS_INTERNET'] +ROBOT_EMAIL_PASSWORD = defaults['ROBOT_EMAIL_PASSWORD_INTERNET'] +SEND_MAIL_PORT = defaults['SEND_MAIL_PORT_INTERNET'] + +cmd = %W[ + docker run + --restart=always + --name=send-internet-mail + -d + -e ROBOT_EMAIL_ADDRESS=#{ROBOT_EMAIL_ADDRESS} + -e ROBOT_EMAIL_PASSWORD=#{ROBOT_EMAIL_PASSWORD} + -e CCI_SRC=/c/compass-ci + -e SEND_MAIL_PORT=#{SEND_MAIL_PORT} + -p #{SEND_MAIL_PORT}:#{SEND_MAIL_PORT} + -v #{ENV['CCI_SRC']}:/c/compass-ci + -v /etc/localtime:/etc/localtime:ro + -w /c/compass-ci + --log-driver json-file + send-internet-mail +] +cmd += ['ruby', "container/send-internet-mail/run.rb"] + +system(*cmd) + +puts <<EOF +port: +--- +data='{ +"subject": "email subject", +"to": "email_to_addr", +"body": "email message" +}' + +or + +data=" +subject: email subject +to: email_to_addr +body: email message" + +Usage: + curl -XPOST 'send-mail-server:49000/send_mail_yaml' -d "$data" + +--- +data=" +To: email_to_addr +Subject: email_subject + +mail_msg_line1 +mail_msg_line2 +... +" + +Usage: + curl -XPOST 'send-mail-server:49000/send_mail_text' -d "$data" +EOF
Reviewed-by: Wang Chenglong 18509160991@163.com
On Fri, Oct 23, 2020 at 10:56:32AM +0800, Luan Shengde wrote:
Signed-off-by: Luan Shengde luanshengde2@huawei.com
container/send-internet-mail/start | 74 ++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100755 container/send-internet-mail/start
diff --git a/container/send-internet-mail/start b/container/send-internet-mail/start new file mode 100755 index 0000000..1ce17bf --- /dev/null +++ b/container/send-internet-mail/start @@ -0,0 +1,74 @@ +#!/usr/bin/env ruby +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +# frozen_string_literal: true
+require 'set' +require_relative '../defconfig'
+docker_rm 'send-internet-mail'
+names = Set.new %w[
- ROBOT_EMAIL_ADDRESS_INTERNET
- ROBOT_EMAIL_PASSWORD_INTERNET
- SEND_MAIL_PORT_INTERNET
+]
+defaults = relevant_defaults(names)
+ROBOT_EMAIL_ADDRESS = defaults['ROBOT_EMAIL_ADDRESS_INTERNET'] +ROBOT_EMAIL_PASSWORD = defaults['ROBOT_EMAIL_PASSWORD_INTERNET'] +SEND_MAIL_PORT = defaults['SEND_MAIL_PORT_INTERNET']
+cmd = %W[
- docker run
- --restart=always
- --name=send-internet-mail
- -d
- -e ROBOT_EMAIL_ADDRESS=#{ROBOT_EMAIL_ADDRESS}
- -e ROBOT_EMAIL_PASSWORD=#{ROBOT_EMAIL_PASSWORD}
- -e CCI_SRC=/c/compass-ci
- -e SEND_MAIL_PORT=#{SEND_MAIL_PORT}
- -p #{SEND_MAIL_PORT}:#{SEND_MAIL_PORT}
- -v #{ENV['CCI_SRC']}:/c/compass-ci
- -v /etc/localtime:/etc/localtime:ro
- -w /c/compass-ci
- --log-driver json-file
- send-internet-mail
+] +cmd += ['ruby', "container/send-internet-mail/run.rb"]
+system(*cmd)
+puts <<EOF +port: +--- +data='{ +"subject": "email subject", +"to": "email_to_addr", +"body": "email message" +}'
+or
+data=" +subject: email subject +to: email_to_addr +body: email message"
+Usage:
- curl -XPOST 'send-mail-server:49000/send_mail_yaml' -d "$data"
+--- +data=" +To: email_to_addr +Subject: email_subject
+mail_msg_line1 +mail_msg_line2 +... +"
+Usage:
- curl -XPOST 'send-mail-server:49000/send_mail_text' -d "$data"
+EOF
2.23.0
On Fri, Oct 23, 2020 at 10:56:32AM +0800, Luan Shengde wrote:
Signed-off-by: Luan Shengde luanshengde2@huawei.com
container/send-internet-mail/start | 74 ++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100755 container/send-internet-mail/start
diff --git a/container/send-internet-mail/start b/container/send-internet-mail/start new file mode 100755 index 0000000..1ce17bf --- /dev/null +++ b/container/send-internet-mail/start @@ -0,0 +1,74 @@ +#!/usr/bin/env ruby +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +# frozen_string_literal: true
+require 'set' +require_relative '../defconfig'
+docker_rm 'send-internet-mail'
+names = Set.new %w[
- ROBOT_EMAIL_ADDRESS_INTERNET
- ROBOT_EMAIL_PASSWORD_INTERNET
- SEND_MAIL_PORT_INTERNET
+]
+defaults = relevant_defaults(names)
+ROBOT_EMAIL_ADDRESS = defaults['ROBOT_EMAIL_ADDRESS_INTERNET'] +ROBOT_EMAIL_PASSWORD = defaults['ROBOT_EMAIL_PASSWORD_INTERNET'] +SEND_MAIL_PORT = defaults['SEND_MAIL_PORT_INTERNET']
+cmd = %W[
- docker run
- --restart=always
- --name=send-internet-mail
- -d
- -e ROBOT_EMAIL_ADDRESS=#{ROBOT_EMAIL_ADDRESS}
- -e ROBOT_EMAIL_PASSWORD=#{ROBOT_EMAIL_PASSWORD}
- -e CCI_SRC=/c/compass-ci
- -e SEND_MAIL_PORT=#{SEND_MAIL_PORT}
- -p #{SEND_MAIL_PORT}:#{SEND_MAIL_PORT}
- -v #{ENV['CCI_SRC']}:/c/compass-ci
- -v /etc/localtime:/etc/localtime:ro
- -w /c/compass-ci
- --log-driver json-file
- send-internet-mail
+] +cmd += ['ruby', "container/send-internet-mail/run.rb"]
+system(*cmd)
it seem show the usage, it is irirlevant to container startup
how about move to another script.
Thanks, Shenwei
+puts <<EOF +port: +--- +data='{ +"subject": "email subject", +"to": "email_to_addr", +"body": "email message" +}'
+or
+data=" +subject: email subject +to: email_to_addr +body: email message"
+Usage:
- curl -XPOST 'send-mail-server:49000/send_mail_yaml' -d "$data"
+--- +data=" +To: email_to_addr +Subject: email_subject
+mail_msg_line1 +mail_msg_line2 +... +"
+Usage:
- curl -XPOST 'send-mail-server:49000/send_mail_text' -d "$data"
+EOF
2.23.0
On Fri, Oct 23, 2020 at 11:28:24AM +0800, Xiao Shenwei wrote:
On Fri, Oct 23, 2020 at 10:56:32AM +0800, Luan Shengde wrote:
Signed-off-by: Luan Shengde luanshengde2@huawei.com
container/send-internet-mail/start | 74 ++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100755 container/send-internet-mail/start
diff --git a/container/send-internet-mail/start b/container/send-internet-mail/start new file mode 100755 index 0000000..1ce17bf --- /dev/null +++ b/container/send-internet-mail/start @@ -0,0 +1,74 @@ +#!/usr/bin/env ruby +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +# frozen_string_literal: true
+require 'set' +require_relative '../defconfig'
+docker_rm 'send-internet-mail'
+names = Set.new %w[
- ROBOT_EMAIL_ADDRESS_INTERNET
- ROBOT_EMAIL_PASSWORD_INTERNET
- SEND_MAIL_PORT_INTERNET
+]
+defaults = relevant_defaults(names)
+ROBOT_EMAIL_ADDRESS = defaults['ROBOT_EMAIL_ADDRESS_INTERNET'] +ROBOT_EMAIL_PASSWORD = defaults['ROBOT_EMAIL_PASSWORD_INTERNET'] +SEND_MAIL_PORT = defaults['SEND_MAIL_PORT_INTERNET']
+cmd = %W[
- docker run
- --restart=always
- --name=send-internet-mail
- -d
- -e ROBOT_EMAIL_ADDRESS=#{ROBOT_EMAIL_ADDRESS}
- -e ROBOT_EMAIL_PASSWORD=#{ROBOT_EMAIL_PASSWORD}
- -e CCI_SRC=/c/compass-ci
- -e SEND_MAIL_PORT=#{SEND_MAIL_PORT}
- -p #{SEND_MAIL_PORT}:#{SEND_MAIL_PORT}
- -v #{ENV['CCI_SRC']}:/c/compass-ci
- -v /etc/localtime:/etc/localtime:ro
- -w /c/compass-ci
- --log-driver json-file
- send-internet-mail
+] +cmd += ['ruby', "container/send-internet-mail/run.rb"]
+system(*cmd)
it seem show the usage, it is irirlevant to container startup
how about move to another script.
I will consider whether need to add a description file for it
Thanks Luan Shengde
Thanks, Shenwei
+puts <<EOF +port: +--- +data='{ +"subject": "email subject", +"to": "email_to_addr", +"body": "email message" +}'
+or
+data=" +subject: email subject +to: email_to_addr +body: email message"
+Usage:
- curl -XPOST 'send-mail-server:49000/send_mail_yaml' -d "$data"
+--- +data=" +To: email_to_addr +Subject: email_subject
+mail_msg_line1 +mail_msg_line2 +... +"
+Usage:
- curl -XPOST 'send-mail-server:49000/send_mail_text' -d "$data"
+EOF
2.23.0
On Fri, Oct 23, 2020 at 10:56:32AM +0800, Luan Shengde wrote:
Signed-off-by: Luan Shengde luanshengde2@huawei.com
container/send-internet-mail/start | 74 ++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100755 container/send-internet-mail/start
diff --git a/container/send-internet-mail/start b/container/send-internet-mail/start new file mode 100755 index 0000000..1ce17bf --- /dev/null +++ b/container/send-internet-mail/start @@ -0,0 +1,74 @@ +#!/usr/bin/env ruby +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +# frozen_string_literal: true
+require 'set' +require_relative '../defconfig'
require_relative '../defconfig.rb'
Thanks, Xijian
On Fri, Oct 23, 2020 at 10:56:32AM +0800, Luan Shengde wrote:
Signed-off-by: Luan Shengde luanshengde2@huawei.com
container/send-internet-mail/start | 74 ++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100755 container/send-internet-mail/start
diff --git a/container/send-internet-mail/start b/container/send-internet-mail/start new file mode 100755 index 0000000..1ce17bf --- /dev/null +++ b/container/send-internet-mail/start @@ -0,0 +1,74 @@ +#!/usr/bin/env ruby +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +# frozen_string_literal: true
+require 'set' +require_relative '../defconfig'
The 'require_relative' just load the name like xx.rb file. require_relative '../defconfig.rb'
and
The 'load' can load the without suffix names load '../defconfig'
Thanks, Chenglong
On Fri, Oct 23, 2020 at 03:01:24PM +0800, Wang Chenglong wrote:
On Fri, Oct 23, 2020 at 10:56:32AM +0800, Luan Shengde wrote:
Signed-off-by: Luan Shengde luanshengde2@huawei.com
container/send-internet-mail/start | 74 ++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100755 container/send-internet-mail/start
diff --git a/container/send-internet-mail/start b/container/send-internet-mail/start new file mode 100755 index 0000000..1ce17bf --- /dev/null +++ b/container/send-internet-mail/start @@ -0,0 +1,74 @@ +#!/usr/bin/env ruby +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +# frozen_string_literal: true
+require 'set' +require_relative '../defconfig'
The 'require_relative' just load the name like xx.rb file. require_relative '../defconfig.rb'
I run require_relative '../defconfig' and it works
and The 'load' can load the without suffix names load '../defconfig'
I will try load
Thanks Luan Shengde
Thanks, Chenglong