From 5941778004d98bce74c58bf84fe4ea2a2194d322 Mon Sep 17 00:00:00 2001 From: Ron Williams Date: Wed, 4 Apr 2018 21:14:57 -0600 Subject: [PATCH 1/4] Implement initial MailHog Support. --- templates/mailhog/0/docker-compose.yml | 12 ++++++++++++ templates/mailhog/0/rancher-compose.yml | 17 +++++++++++++++++ templates/mailhog/catalogIcon-mailhog.png | Bin 0 -> 2806 bytes templates/mailhog/config.yml | 4 ++++ 4 files changed, 33 insertions(+) create mode 100644 templates/mailhog/0/docker-compose.yml create mode 100644 templates/mailhog/0/rancher-compose.yml create mode 100644 templates/mailhog/catalogIcon-mailhog.png create mode 100644 templates/mailhog/config.yml diff --git a/templates/mailhog/0/docker-compose.yml b/templates/mailhog/0/docker-compose.yml new file mode 100644 index 0000000..36f29cc --- /dev/null +++ b/templates/mailhog/0/docker-compose.yml @@ -0,0 +1,12 @@ +version: '2' +services: + mailhog: + image: mailhog/mailhog + environment: + MH_UI_WEB_PATH: ${mh_ui_web_path} + MH_SMTP_BIND_ADDR: ${mh_smtp_bind_addr} + stdin_open: true + tty: true + user: root + labels: + io.rancher.container.pull_image: always diff --git a/templates/mailhog/0/rancher-compose.yml b/templates/mailhog/0/rancher-compose.yml new file mode 100644 index 0000000..eae53e6 --- /dev/null +++ b/templates/mailhog/0/rancher-compose.yml @@ -0,0 +1,17 @@ +.catalog: + name: MailHog + version: 0.0.1 + description: MailHog E-mail Capture Tools + questions: + - variable: mh_ui_web_path + label: Web UI Path + type: string + required: true + default: '' + description: Defines the URL path for viewing MailHog. + - variable: mh_smtp_bind_addr + label: SMTP Bind Address + type: string + required: true + default: 0.0.0.0:25 + description: Defines the IP/Port combination for the SMTP listener. diff --git a/templates/mailhog/catalogIcon-mailhog.png b/templates/mailhog/catalogIcon-mailhog.png new file mode 100644 index 0000000000000000000000000000000000000000..c846729fbbba52c9e64b2576945bc50dcdfd43fe GIT binary patch literal 2806 zcma)8`9IT-;~$Zuj5S9T*`f)_8*leyyoMDc*4rJ*8Jp#(oVlir99ym!G0XAJ5viOJ zDl|vTHF7magm;V%s*k_m`}qFwJbrlo^8Drbcv9@JmSUoEq971R3}Xe@ALxezYPZ~fstYQ>9 zS3WNHo&3}}0-c4EH4w)jRUxJg{Kw{}vjvob^4izmO~=wxts-exz~p~SPXU^Ptz4C* z-9%_So)51M8T!`R)4Bm4+kGbOx|yEI2rX8VH?BxLs%bqN^Sgn377?Ps7(#oh#xk-s z-sS8TU+E1lv;6uk>Q@8-93cEKKtdMgcAD8blOIwrbrC^iqyrV#s42148K0!3uI8dq zPN$BvBg*QSNXg8jl5SQ1LEy}FRm)C_u>loao#KB>G(kiJ!cH?OJ5SPv2>Ua@4XWA> zU}x4{xre!JXz`Hi^}ptTK}kmQz~$lpR&QrWpfH4RwVFk9oIDqm-NZD= zb>srlg~DIe<$D@OPpXA0GQ@LMy;|O5`4ILHc+ps*47{wM2K`tD*Y5Ol=HAj?5fvKF z1>g#yibc1$r8J?kqcZunAD0guSKHmywKRHZHb|k9S86@(&JHCM6+Ccii2hRvKHjk! zl=a?TNZmdc=6NC>JW1L5;Q%K;bO}56SHQ}x>~17S`Un)6j>C-$UhX%S_)u)QeE-gG z8-?0&*6;7jn*nLxtb!v@Q{ZG==#!`zbzPoA>Yv+sx8I^N24qoIuv3ynkvp^#&T?9$ zJ3{C(_eQTTYOWV@@Ep2b${|#L=Egu+6-~5sVS11mPM*X0Ea z^fLTjO;BgM0Q7EhPW1rPu!sV2=aMsIH<4Jmpi2H@F&go|> zMLDw7^Z~;iwUOOer)vuTLen0Jd`&?J%;i(LpXY-QRx61^n31?m3GR zLn@JG?C!xY!8|cp{Jtsl$FU8nN%r{}TGP!aHcX(ShC(0qL^lAQFJ3tC`*%*0{f*c} zf~@S05TEAQrSq3l$V9N&e1lHunP^C_)Tg91v;=r|dGyT^&?u3Vd^EzNTZwUQ^(eo$ zM-m(DzibAaUOi$aMKdt*?}Idu-?F6ySWYAz5oZ8Y@~p(nkg)B$Cga*Kvu7cX0(ypv zoVT9ZE~NjCtq29woXc6DSmNWv;n4c1&ALG%0o7*8WyLH5tc~OeOiZe^lyvtlDg0R7+|wF;Va#yCfAb(q+EQkwXiL=veo9R1vFPo> zTK=G>-j}EwipL21u6k}b2wbLEk(63&lb@E9@~%x?fzk0e&!*J%qwKZ;>&a8izso-u zQB$lU7sUB+46fu}X5!)ils(wWf zmX`nxAl>~skxKa4Lpo_NUKgP++8qIIIcD2~6grx2L(Br*m}53)52Wy8;y|6op5K+9a85WGx3?yr`Q=HJJKQ=BW3M zqVV7I9I{1BN?HL-HYQiQAR0nrbMKIqFE1kG_U{Xd!%&=C$P4pscMO!ZrD>bn%}kUZQX20e z!Z_VYQMm4sTk@KGcot(K31BG)`&-lK=H7SEoUD>{J^_j}gp33)!1Drw^r^c_a&kIi z;=Ur6WDkpDvy7c>+1+W}rAzga5w33p4xPkxP&lWbsQ3vA8Ff<^2t6efMPJBhI0Lcg z^CT1N-xo)waRUoA7ao?3o-yaT;7wpSQZq^0e=fIia&C zePK<1$a;h1glAnVMg&k{2q12-CK5C)B?DXG98(}IB6waKa=9BW*Pi+1#lxMUZ+3)7 zhcn3ew4cJk{7YG9(#Zctj^_e)e!AZ?lN%q_nP@`Rt2mlrwkv2c81}IJqZgf1BK8y` z`um*ywgFJrUOXF-c#d2#jL)G|47lXB#WzyVA%4nMCY@z8b&U(lSXjjj$_C+eFIcF0 zrBnSCMuW4TrP#8wU3-ajs@CD_t|xU7d^cj}0qlv?c91aSN?g<;rGX>mLWJ)<Y kLHHEm|CjAB`XizV+UO Date: Wed, 4 Apr 2018 21:18:35 -0600 Subject: [PATCH 2/4] Remove requirement for WebUI path. --- templates/mailhog/0/rancher-compose.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/templates/mailhog/0/rancher-compose.yml b/templates/mailhog/0/rancher-compose.yml index eae53e6..52e2d79 100644 --- a/templates/mailhog/0/rancher-compose.yml +++ b/templates/mailhog/0/rancher-compose.yml @@ -6,9 +6,7 @@ - variable: mh_ui_web_path label: Web UI Path type: string - required: true - default: '' - description: Defines the URL path for viewing MailHog. + description: Defines the URL path for viewing MailHog. Will use "/" if left blank. - variable: mh_smtp_bind_addr label: SMTP Bind Address type: string From 606a848e3bc464d34efa4b94d7495212a3be79da Mon Sep 17 00:00:00 2001 From: Ron Williams Date: Wed, 4 Apr 2018 21:25:16 -0600 Subject: [PATCH 3/4] Specify version for MailHog container image. --- templates/mailhog/0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/mailhog/0/docker-compose.yml b/templates/mailhog/0/docker-compose.yml index 36f29cc..807d04d 100644 --- a/templates/mailhog/0/docker-compose.yml +++ b/templates/mailhog/0/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: mailhog: - image: mailhog/mailhog + image: mailhog/mailhog:v1.0.0 environment: MH_UI_WEB_PATH: ${mh_ui_web_path} MH_SMTP_BIND_ADDR: ${mh_smtp_bind_addr} From 05019d8f31f0d7a6fc6d26c8d675cd782515e38b Mon Sep 17 00:00:00 2001 From: Ron Williams Date: Fri, 6 Apr 2018 08:28:45 -0600 Subject: [PATCH 4/4] Add README for use until a public port available for conditional exposure. --- templates/mailhog/0/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 templates/mailhog/0/README.md diff --git a/templates/mailhog/0/README.md b/templates/mailhog/0/README.md new file mode 100644 index 0000000..8e00b33 --- /dev/null +++ b/templates/mailhog/0/README.md @@ -0,0 +1 @@ +The mailhog catalog configuration provides SMTP access on the internal network by default. External SMTP access can be exposed through a TCP Rancher load balancer routing to internal port 25. The Mailhog UI can be exposed through an HTTP(S) Rancher Load Balancer routing to internal port 8025.