friendica/docker
2
0
Fork 0
mirror of https://github.com/friendica/docker synced 2025-01-19 17:37:00 +01:00
Code Issues Releases Wiki Activity

Move SSMTP Setup to outside of the check since it has to get checked for cronjobs too

Browse source
This commit is contained in:
Philipp Holzer 2020-07-22 12:08:08 +02:00
parent f2ed829c94
commit f18979f1ec
No known key found for this signature in database
GPG key ID: 9A28B7D4FF5667BD
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docker-entrypoint.sh
View file

@ -50,6 +50,8 @@ setup_ssmtp() {
fi fi
} }
setup_ssmtp
# just check if we execute apache or php-fpm # just check if we execute apache or php-fpm
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
installed_version="0.0.0.0" installed_version="0.0.0.0"
@ -65,8 +67,6 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
exit 1 exit 1
fi fi
setup_ssmtp
# check it just in case the version is greater or if we force the upgrade # check it just in case the version is greater or if we force the upgrade
if version_greater "$image_version" "$installed_version" || [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then if version_greater "$image_version" "$installed_version" || [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
echo "Initializing Friendica $image_version ..." echo "Initializing Friendica $image_version ..."