From 101a716f6077e4de37925f931151b16ea98cadcc Mon Sep 17 00:00:00 2001 From: Sebastian Rakel Date: Wed, 29 Aug 2018 10:00:01 +0200 Subject: Remove package source --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3e2c5d3a4..c0ebb8dab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:edge MAINTAINER Sebastian Rakel -RUN apk add --no-cache -X https://dl-cdn.alpinelinux.org/alpine/edge/testing bash php7 py-pygments py2-pip imagemagick php7-gd nodejs composer php7-pdo_mysql php7-exif php7-ctype php7-session git php7-finfo +RUN apk add --no-cache bash php7 py-pygments py2-pip imagemagick php7-gd nodejs composer php7-pdo_mysql php7-exif php7-ctype php7-session git php7-finfo ENV FILEBIN_HOME_DIR /var/lib/filebin ENV FILEBIN_DIR $FILEBIN_HOME_DIR/filebin -- cgit v1.2.3-24-g4f1b From eba4933c6d529ec76048d21af8218be90fd6505b Mon Sep 17 00:00:00 2001 From: Sebastian Rakel Date: Wed, 29 Aug 2018 10:00:19 +0200 Subject: Change php7-finfo to php7-fileinfo The package was renamed in alpine --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c0ebb8dab..2645ec764 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:edge MAINTAINER Sebastian Rakel -RUN apk add --no-cache bash php7 py-pygments py2-pip imagemagick php7-gd nodejs composer php7-pdo_mysql php7-exif php7-ctype php7-session git php7-finfo +RUN apk add --no-cache bash php7 py-pygments py2-pip imagemagick php7-gd nodejs composer php7-pdo_mysql php7-exif php7-ctype php7-session git php7-fileinfo ENV FILEBIN_HOME_DIR /var/lib/filebin ENV FILEBIN_DIR $FILEBIN_HOME_DIR/filebin -- cgit v1.2.3-24-g4f1b From ece8a5d7e499f99c2171edbcf5e4dde455541912 Mon Sep 17 00:00:00 2001 From: Sebastian Rakel Date: Wed, 29 Aug 2018 10:00:54 +0200 Subject: Use msmtp to send mail in docker container To send mails in the docker container we need to configure php to use a smtp client and provide smtp credentials to the docker container --- Dockerfile | 4 +++- docker/README.md | 5 +++++ docker/docker-compose.yml | 4 ++++ docker/filebin_starter.sh | 18 ++++++++++++++++++ 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2645ec764..6a038898f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:edge MAINTAINER Sebastian Rakel -RUN apk add --no-cache bash php7 py-pygments py2-pip imagemagick php7-gd nodejs composer php7-pdo_mysql php7-exif php7-ctype php7-session git php7-fileinfo +RUN apk add --no-cache bash php7 py-pygments py2-pip imagemagick php7-gd nodejs composer php7-pdo_mysql php7-exif php7-ctype php7-session git php7-fileinfo msmtp ENV FILEBIN_HOME_DIR /var/lib/filebin ENV FILEBIN_DIR $FILEBIN_HOME_DIR/filebin @@ -13,6 +13,8 @@ RUN chown filebin: -R $FILEBIN_HOME_DIR RUN pip install ansi2html +RUN sed -i 's+.*sendmail_path =.*+sendmail_path = "/usr/bin/msmtp -C ${FILEBIN_HOME_DIR}/msmtprc --logfile ${FILEBIN_HOME_DIR}/msmtp.log -a filebinmail -t"+' /etc/php7/php.ini + USER filebin ADD docker/filebin_starter.sh $FILEBIN_HOME_DIR diff --git a/docker/README.md b/docker/README.md index 32a812cda..775afa1de 100644 --- a/docker/README.md +++ b/docker/README.md @@ -23,6 +23,11 @@ The PHP webserver is listening on ```8080``` - **FB_CONTACT_NAME:** Contact Name - **FB_CONTACT_MAIL:** Contact E-Mail (will be used as email for the first user) +- **FB_SMTP_HOST:** Address of the SMTP Server +- **FB_SMTP_PORT:** Port for SMTP Server (default 587) +- **FB_SMTP_USER:** Username for SMTP Server (will also be used as mail from) +- **FB_SMTP_PASSWORD:** Password for the SMTP Server Useraccount + ## First User The first user is **admin** with the password **admin** diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 03bc37f59..7450f6903 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -22,4 +22,8 @@ services: - FB_DB_DATABASE=filebin - FB_CONTACT_NAME=John Doe - FB_CONTACT_MAIL=root@example.local + - FB_SMTP_HOST=localhost + - FB_SMTP_PORT=587 + - FB_SMTP_USER=webmaster@example.invalid + - FB_SMTP_PASSWORD=mysecretpassword diff --git a/docker/filebin_starter.sh b/docker/filebin_starter.sh index 7f0b70d85..66f9a8b03 100755 --- a/docker/filebin_starter.sh +++ b/docker/filebin_starter.sh @@ -2,12 +2,29 @@ #set -euo pipefail +function set_mail_config() { +cat < ${FILEBIN_HOME_DIR}/msmtprc +account filebinmail +tls on +tls_certcheck off +auth on +host ${FB_SMTP_HOST} +port ${FB_SMTP_PORT} +user ${FB_SMTP_USER} +from ${FB_SMTP_USER} +password ${FB_SMTP_PASSWORD} +EOF + +chmod 600 ${FILEBIN_HOME_DIR}/msmtprc +} + function set_config() { FB_ENCRYPTION_KEY=`< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c32` cat <${FILEBIN_DIR}/application/config/config-local.php