diff --git a/Dockerfile b/Dockerfile index 8ec747c..513e9e4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:latest MAINTAINER Bandie -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 mkdir /www diff --git a/start.sh b/start.sh index 72263ab..dc643c4 100644 --- a/start.sh +++ b/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/%%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 diff --git a/www/config.php b/www/config.php index cbe3155..b934489 100644 --- a/www/config.php +++ b/www/config.php @@ -6,3 +6,5 @@ $recipients = [ %%RECIPIENTS_PR%% ] ]; + +$from = '%%SMTP_FROM%%'; diff --git a/www/pr.php b/www/pr.php index ba46afa..b6442df 100644 --- a/www/pr.php +++ b/www/pr.php @@ -1,5 +1,5 @@