mirror of
https://github.com/friendica/docker
synced 2025-03-04 18:13:47 +01:00
commit
3a93a57b8a
19 changed files with 24 additions and 26 deletions
2019.12
2020.03-dev
apache
fpm-alpine
fpm
|
@ -24,7 +24,6 @@ RUN set -ex; \
|
|||
apt-get install -y --no-install-recommends \
|
||||
mysql-client \
|
||||
bash \
|
||||
$PHPIZE_DEPS \
|
||||
libpng-dev \
|
||||
libjpeg62-turbo-dev \
|
||||
libtool \
|
||||
|
|
|
@ -23,8 +23,8 @@ setup_ssmtp() {
|
|||
smtp_from=${SMTP_FROM:-no-reply}
|
||||
|
||||
# Setup SSMTP
|
||||
sed -i "s/:root:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
|
||||
sed -i "s/:Linux\ User:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
|
||||
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
|
||||
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data
|
||||
|
||||
# add possible mail-senders
|
||||
{
|
||||
|
|
|
@ -7,7 +7,8 @@ RUN set -ex; \
|
|||
rsync \
|
||||
git \
|
||||
# For mail() support
|
||||
ssmtp;
|
||||
ssmtp \
|
||||
shadow;
|
||||
|
||||
# install the PHP extensions we need
|
||||
# see https://friendi.ca/resources/requirements/
|
||||
|
|
|
@ -23,8 +23,8 @@ setup_ssmtp() {
|
|||
smtp_from=${SMTP_FROM:-no-reply}
|
||||
|
||||
# Setup SSMTP
|
||||
sed -i "s/:root:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
|
||||
sed -i "s/:Linux\ User:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
|
||||
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
|
||||
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data
|
||||
|
||||
# add possible mail-senders
|
||||
{
|
||||
|
|
|
@ -24,7 +24,6 @@ RUN set -ex; \
|
|||
apt-get install -y --no-install-recommends \
|
||||
mysql-client \
|
||||
bash \
|
||||
$PHPIZE_DEPS \
|
||||
libpng-dev \
|
||||
libjpeg62-turbo-dev \
|
||||
libtool \
|
||||
|
|
|
@ -23,8 +23,8 @@ setup_ssmtp() {
|
|||
smtp_from=${SMTP_FROM:-no-reply}
|
||||
|
||||
# Setup SSMTP
|
||||
sed -i "s/:root:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
|
||||
sed -i "s/:Linux\ User:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
|
||||
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
|
||||
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data
|
||||
|
||||
# add possible mail-senders
|
||||
{
|
||||
|
|
|
@ -24,7 +24,6 @@ RUN set -ex; \
|
|||
apt-get install -y --no-install-recommends \
|
||||
mysql-client \
|
||||
bash \
|
||||
$PHPIZE_DEPS \
|
||||
libpng-dev \
|
||||
libjpeg62-turbo-dev \
|
||||
libtool \
|
||||
|
|
|
@ -66,4 +66,4 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
|||
fi
|
||||
fi
|
||||
|
||||
/entrypoint.sh "$@"
|
||||
exec /entrypoint.sh "$@"
|
||||
|
|
|
@ -23,8 +23,8 @@ setup_ssmtp() {
|
|||
smtp_from=${SMTP_FROM:-no-reply}
|
||||
|
||||
# Setup SSMTP
|
||||
sed -i "s/:root:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
|
||||
sed -i "s/:Linux\ User:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
|
||||
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
|
||||
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data
|
||||
|
||||
# add possible mail-senders
|
||||
{
|
||||
|
|
|
@ -7,7 +7,8 @@ RUN set -ex; \
|
|||
rsync \
|
||||
git \
|
||||
# For mail() support
|
||||
ssmtp;
|
||||
ssmtp \
|
||||
shadow;
|
||||
|
||||
# install the PHP extensions we need
|
||||
# see https://friendi.ca/resources/requirements/
|
||||
|
|
|
@ -66,4 +66,4 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
|||
fi
|
||||
fi
|
||||
|
||||
/entrypoint.sh "$@"
|
||||
exec /entrypoint.sh "$@"
|
||||
|
|
|
@ -23,8 +23,8 @@ setup_ssmtp() {
|
|||
smtp_from=${SMTP_FROM:-no-reply}
|
||||
|
||||
# Setup SSMTP
|
||||
sed -i "s/:root:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
|
||||
sed -i "s/:Linux\ User:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
|
||||
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
|
||||
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data
|
||||
|
||||
# add possible mail-senders
|
||||
{
|
||||
|
|
|
@ -24,7 +24,6 @@ RUN set -ex; \
|
|||
apt-get install -y --no-install-recommends \
|
||||
mysql-client \
|
||||
bash \
|
||||
$PHPIZE_DEPS \
|
||||
libpng-dev \
|
||||
libjpeg62-turbo-dev \
|
||||
libtool \
|
||||
|
|
|
@ -66,4 +66,4 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
|||
fi
|
||||
fi
|
||||
|
||||
/entrypoint.sh "$@"
|
||||
exec /entrypoint.sh "$@"
|
||||
|
|
|
@ -23,8 +23,8 @@ setup_ssmtp() {
|
|||
smtp_from=${SMTP_FROM:-no-reply}
|
||||
|
||||
# Setup SSMTP
|
||||
sed -i "s/:root:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
|
||||
sed -i "s/:Linux\ User:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
|
||||
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
|
||||
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data
|
||||
|
||||
# add possible mail-senders
|
||||
{
|
||||
|
|
|
@ -6,7 +6,8 @@ RUN set -ex; \
|
|||
rsync \
|
||||
git \
|
||||
# For mail() support
|
||||
ssmtp;
|
||||
ssmtp \
|
||||
shadow;
|
||||
|
||||
# install the PHP extensions we need
|
||||
# see https://friendi.ca/resources/requirements/
|
||||
|
|
|
@ -23,7 +23,6 @@ RUN set -ex; \
|
|||
apt-get install -y --no-install-recommends \
|
||||
mysql-client \
|
||||
bash \
|
||||
$PHPIZE_DEPS \
|
||||
libpng-dev \
|
||||
libjpeg62-turbo-dev \
|
||||
libtool \
|
||||
|
|
|
@ -66,4 +66,4 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
|
|||
fi
|
||||
fi
|
||||
|
||||
/entrypoint.sh "$@"
|
||||
exec /entrypoint.sh "$@"
|
||||
|
|
|
@ -23,8 +23,8 @@ setup_ssmtp() {
|
|||
smtp_from=${SMTP_FROM:-no-reply}
|
||||
|
||||
# Setup SSMTP
|
||||
sed -i "s/:root:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
|
||||
sed -i "s/:Linux\ User:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
|
||||
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
|
||||
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data
|
||||
|
||||
# add possible mail-senders
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue