friendica/docker
2
0
Fork 0
mirror of https://github.com/friendica/docker synced 2025-03-04 10:03:43 +01:00
Code Issues Releases Wiki Activity

Merge pull request #97 from nupplaphil/Fixing-SMTP

Browse source 
Fixing issues
This commit is contained in:
Hypolite Petovan 2020-01-03 12:54:57 -05:00 committed by GitHub
commit 3a93a57b8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 24 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
2019.12/apache/Dockerfile
View file

@ -24,7 +24,6 @@ RUN set -ex; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
mysql-client \ mysql-client \
bash \ bash \
$PHPIZE_DEPS \
libpng-dev \ libpng-dev \
libjpeg62-turbo-dev \ libjpeg62-turbo-dev \
libtool \ libtool \

4
2019.12/apache/entrypoint.sh
View file

@ -23,8 +23,8 @@ setup_ssmtp() {
smtp_from=${SMTP_FROM:-no-reply} smtp_from=${SMTP_FROM:-no-reply}
# Setup SSMTP # Setup SSMTP
sed -i "s/:root:/:${FRIENDICA_SITENAME}:/g" /etc/passwd usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
sed -i "s/:Linux\ User:/:${FRIENDICA_SITENAME}:/g" /etc/passwd usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data
# add possible mail-senders # add possible mail-senders
{ {

3
2019.12/fpm-alpine/Dockerfile
View file

@ -7,7 +7,8 @@ RUN set -ex; \
rsync \ rsync \
git \ git \
# For mail() support # For mail() support
ssmtp; ssmtp \
shadow;
# install the PHP extensions we need # install the PHP extensions we need
# see https://friendi.ca/resources/requirements/ # see https://friendi.ca/resources/requirements/

4
2019.12/fpm-alpine/entrypoint.sh
View file

@ -23,8 +23,8 @@ setup_ssmtp() {
smtp_from=${SMTP_FROM:-no-reply} smtp_from=${SMTP_FROM:-no-reply}
# Setup SSMTP # Setup SSMTP
sed -i "s/:root:/:${FRIENDICA_SITENAME}:/g" /etc/passwd usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
sed -i "s/:Linux\ User:/:${FRIENDICA_SITENAME}:/g" /etc/passwd usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data
# add possible mail-senders # add possible mail-senders
{ {

1
2019.12/fpm/Dockerfile
View file

@ -24,7 +24,6 @@ RUN set -ex; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
mysql-client \ mysql-client \
bash \ bash \
$PHPIZE_DEPS \
libpng-dev \ libpng-dev \
libjpeg62-turbo-dev \ libjpeg62-turbo-dev \
libtool \ libtool \

4
2019.12/fpm/entrypoint.sh
View file

@ -23,8 +23,8 @@ setup_ssmtp() {
smtp_from=${SMTP_FROM:-no-reply} smtp_from=${SMTP_FROM:-no-reply}
# Setup SSMTP # Setup SSMTP
sed -i "s/:root:/:${FRIENDICA_SITENAME}:/g" /etc/passwd usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
sed -i "s/:Linux\ User:/:${FRIENDICA_SITENAME}:/g" /etc/passwd usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data
# add possible mail-senders # add possible mail-senders
{ {

1
2020.03-dev/apache/Dockerfile
View file

@ -24,7 +24,6 @@ RUN set -ex; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
mysql-client \ mysql-client \
bash \ bash \
$PHPIZE_DEPS \
libpng-dev \ libpng-dev \
libjpeg62-turbo-dev \ libjpeg62-turbo-dev \
libtool \ libtool \

2
2020.03-dev/apache/entrypoint-dev.sh
View file

@ -66,4 +66,4 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
fi fi
fi fi
/entrypoint.sh "$@" exec /entrypoint.sh "$@"

4
2020.03-dev/apache/entrypoint.sh
View file

@ -23,8 +23,8 @@ setup_ssmtp() {
smtp_from=${SMTP_FROM:-no-reply} smtp_from=${SMTP_FROM:-no-reply}
# Setup SSMTP # Setup SSMTP
sed -i "s/:root:/:${FRIENDICA_SITENAME}:/g" /etc/passwd usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
sed -i "s/:Linux\ User:/:${FRIENDICA_SITENAME}:/g" /etc/passwd usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data
# add possible mail-senders # add possible mail-senders
{ {

3
2020.03-dev/fpm-alpine/Dockerfile
View file

@ -7,7 +7,8 @@ RUN set -ex; \
rsync \ rsync \
git \ git \
# For mail() support # For mail() support
ssmtp; ssmtp \
shadow;
# install the PHP extensions we need # install the PHP extensions we need
# see https://friendi.ca/resources/requirements/ # see https://friendi.ca/resources/requirements/

2
2020.03-dev/fpm-alpine/entrypoint-dev.sh
View file

@ -66,4 +66,4 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
fi fi
fi fi
/entrypoint.sh "$@" exec /entrypoint.sh "$@"

4
2020.03-dev/fpm-alpine/entrypoint.sh
View file

@ -23,8 +23,8 @@ setup_ssmtp() {
smtp_from=${SMTP_FROM:-no-reply} smtp_from=${SMTP_FROM:-no-reply}
# Setup SSMTP # Setup SSMTP
sed -i "s/:root:/:${FRIENDICA_SITENAME}:/g" /etc/passwd usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
sed -i "s/:Linux\ User:/:${FRIENDICA_SITENAME}:/g" /etc/passwd usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data
# add possible mail-senders # add possible mail-senders
{ {

1
2020.03-dev/fpm/Dockerfile
View file

@ -24,7 +24,6 @@ RUN set -ex; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
mysql-client \ mysql-client \
bash \ bash \
$PHPIZE_DEPS \
libpng-dev \ libpng-dev \
libjpeg62-turbo-dev \ libjpeg62-turbo-dev \
libtool \ libtool \

2
2020.03-dev/fpm/entrypoint-dev.sh
View file

@ -66,4 +66,4 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
fi fi
fi fi
/entrypoint.sh "$@" exec /entrypoint.sh "$@"

4
2020.03-dev/fpm/entrypoint.sh
View file

@ -23,8 +23,8 @@ setup_ssmtp() {
smtp_from=${SMTP_FROM:-no-reply} smtp_from=${SMTP_FROM:-no-reply}
# Setup SSMTP # Setup SSMTP
sed -i "s/:root:/:${FRIENDICA_SITENAME}:/g" /etc/passwd usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
sed -i "s/:Linux\ User:/:${FRIENDICA_SITENAME}:/g" /etc/passwd usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data
# add possible mail-senders # add possible mail-senders
{ {

3
Dockerfile-alpine.template
View file

@ -6,7 +6,8 @@ RUN set -ex; \
rsync \ rsync \
git \ git \
# For mail() support # For mail() support
ssmtp; ssmtp \
shadow;
# install the PHP extensions we need # install the PHP extensions we need
# see https://friendi.ca/resources/requirements/ # see https://friendi.ca/resources/requirements/

1
Dockerfile-debian.template
View file

@ -23,7 +23,6 @@ RUN set -ex; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
mysql-client \ mysql-client \
bash \ bash \
$PHPIZE_DEPS \
libpng-dev \ libpng-dev \
libjpeg62-turbo-dev \ libjpeg62-turbo-dev \
libtool \ libtool \

2
docker-entrypoint-dev.sh
View file

@ -66,4 +66,4 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
fi fi
fi fi
/entrypoint.sh "$@" exec /entrypoint.sh "$@"

4
docker-entrypoint.sh
View file

@ -23,8 +23,8 @@ setup_ssmtp() {
smtp_from=${SMTP_FROM:-no-reply} smtp_from=${SMTP_FROM:-no-reply}
# Setup SSMTP # Setup SSMTP
sed -i "s/:root:/:${FRIENDICA_SITENAME}:/g" /etc/passwd usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
sed -i "s/:Linux\ User:/:${FRIENDICA_SITENAME}:/g" /etc/passwd usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data
# add possible mail-senders # add possible mail-senders
{ {