friendica
/
docker
mirror of https://github.com/friendica/docker
2
0
Fork 0
Code Issues Releases Wiki Activity

Fixing some issues: 

- explicit exec entrypoint.sh
- Adding "shadow" support
- Adding "usermod" calls for setting username
- Remove superfluous $PHPIZE_DEPS from debian package
This commit is contained in:
Philipp Holzer 2020-01-03 19:20:20 +01:00
parent c37e773016
commit bbd9df6049
No known key found for this signature in database
GPG Key ID: D8365C3D36B77D90
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 \
mysql-client \
bash \
$PHPIZE_DEPS \
libpng-dev \
libjpeg62-turbo-dev \
libtool \

4
2019.12/apache/entrypoint.sh
View File

@ -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
{

3
2019.12/fpm-alpine/Dockerfile
View File

@ -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/

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

@ -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
{

1
2019.12/fpm/Dockerfile
View File

@ -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 \

4
2019.12/fpm/entrypoint.sh
View File

@ -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
{

1
2020.03-dev/apache/Dockerfile
View File

@ -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 \

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
/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}
# 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
{

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

@ -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/

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
/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}
# 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
{

1
2020.03-dev/fpm/Dockerfile
View File

@ -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 \

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
/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}
# 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
{

3
Dockerfile-alpine.template
View File

@ -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/

1
Dockerfile-debian.template
View File

@ -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 \

2
docker-entrypoint-dev.sh
View File

@ -66,4 +66,4 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
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}
# 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
{