Couple of fixes, adding php-json
This commit is contained in:
parent
1265f2b339
commit
ed67c68a1a
@ -1,7 +1,7 @@
|
|||||||
FROM alpine:latest
|
FROM alpine:latest
|
||||||
MAINTAINER Bandie <bandie@chaospott.de>
|
MAINTAINER Bandie <bandie@chaospott.de>
|
||||||
|
|
||||||
RUN apk add --no-cache php nginx php-fpm msmtp tzdata
|
RUN apk add --no-cache php nginx php-fpm php-json msmtp tzdata
|
||||||
|
|
||||||
RUN adduser -D -g 'www' www
|
RUN adduser -D -g 'www' www
|
||||||
RUN mkdir /www
|
RUN mkdir /www
|
||||||
|
2
start.sh
2
start.sh
@ -20,7 +20,7 @@ sed -i "s/\$SMTP_HOST/$SMTP_HOST/g;s/\$SMTP_PORT/$SMTP_PORT/g;s/\$SMTP_FROM/$SMT
|
|||||||
|
|
||||||
sed -i "s/\$SMTP_HOST/$SMTP_HOST/g;s/\$SMTP_PORT/$SMTP_PORT/g;s/\$SMTP_FROM/$SMTP_FROM/g;s/\$SMTP_USER/$SMTP_USER/g;s/\$SMTP_PASSWORD/$SMTP_PASSWORD/g;s/\$SMTP_ENCRYPTION/$SMTP_ENCRYPTION/g" /etc/aliases
|
sed -i "s/\$SMTP_HOST/$SMTP_HOST/g;s/\$SMTP_PORT/$SMTP_PORT/g;s/\$SMTP_FROM/$SMTP_FROM/g;s/\$SMTP_USER/$SMTP_USER/g;s/\$SMTP_PASSWORD/$SMTP_PASSWORD/g;s/\$SMTP_ENCRYPTION/$SMTP_ENCRYPTION/g" /etc/aliases
|
||||||
|
|
||||||
sed -i "s/%%SECRETKEY%%/$SECRET_KEY/g;s/%%RECIPIENTS_PR%%/$RECIPIENTS_PR/g" /www/config.php
|
sed -i "s/%%SECRETKEY%%/$SECRET_KEY/g;s/%%RECIPIENTS_PR%%/$RECIPIENTS_PR/g;s/%%SMTP_FROM%%/$SMTP_FROM/g" /www/config.php
|
||||||
|
|
||||||
sed -i "s/%%DOMAIN_NAME%%/$DOMAIN_NAME/g" /etc/nginx/nginx.conf
|
sed -i "s/%%DOMAIN_NAME%%/$DOMAIN_NAME/g" /etc/nginx/nginx.conf
|
||||||
|
|
||||||
|
@ -6,3 +6,5 @@ $recipients = [
|
|||||||
%%RECIPIENTS_PR%%
|
%%RECIPIENTS_PR%%
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
|
|
||||||
|
$from = '%%SMTP_FROM%%';
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
require_once('config.php');
|
include('config.php');
|
||||||
|
|
||||||
// check for POST request
|
// check for POST request
|
||||||
if ($_SERVER['REQUEST_METHOD'] != 'POST') {
|
if ($_SERVER['REQUEST_METHOD'] != 'POST') {
|
||||||
@ -50,11 +50,9 @@ $message = $decoded['sender']['login']
|
|||||||
. ".\n" .
|
. ".\n" .
|
||||||
$decoded['pull_request']['html_url'];
|
$decoded['pull_request']['html_url'];
|
||||||
|
|
||||||
log("SUBJECT: " . $subject . "; " . $message);
|
|
||||||
|
|
||||||
|
|
||||||
foreach($recipients['pr'] as $recp) {
|
foreach($recipients['pr'] as $recp) {
|
||||||
mail($recp, $subject, $message);
|
mail($recp, $subject, $message, $from);
|
||||||
}
|
}
|
||||||
|
|
||||||
// success, do something
|
// success, do something
|
||||||
|
Loading…
Reference in New Issue
Block a user