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

Merge pull request #98 from nupplaphil/Fixing-issues

Browse source 
Fixing issues
This commit is contained in:
Tobias Diekershoff 2020-01-05 00:51:36 +01:00 committed by GitHub
commit 58123533d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 49 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
2019.12/apache/cron.sh
View file

@ -6,7 +6,7 @@ while [ ! -f /var/www/html/bin/daemon.php ]; do
done
echo "Waiting for MySQL $MYSQL_HOST initialization..."
if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then
exec php /var/www/html/bin/daemon.php -f start
else
echo "[ERROR] Waited 300 seconds, no response" >&2

11
2019.12/apache/entrypoint.sh
View file

@ -17,14 +17,15 @@ version_greater() {
}
setup_ssmtp() {
if [ -n "${FRIENDICA_SITENAME+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
echo "Setup SSMTP for '$FRIENDICA_SITENAME' with '$SMTP' ..."
if [ -n "${HOSTNAME+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
SITENAME="${FRIENDICA_SITENAME:-Friendica Social Network}"
echo "Setup SSMTP for '$SITENAME' with '$SMTP' ..."
smtp_from=${SMTP_FROM:-no-reply}
# Setup SSMTP
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" www-data
# add possible mail-senders
{
@ -117,7 +118,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
if [ "$install" = true ]; then
echo "Waiting for MySQL $MYSQL_HOST initialization..."
if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then
echo "Starting Friendica installation ..."
run_as "php /var/www/html/bin/console.php autoinstall $install_options"

2
2019.12/fpm-alpine/cron.sh
View file

@ -6,7 +6,7 @@ while [ ! -f /var/www/html/bin/daemon.php ]; do
done
echo "Waiting for MySQL $MYSQL_HOST initialization..."
if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then
exec php /var/www/html/bin/daemon.php -f start
else
echo "[ERROR] Waited 300 seconds, no response" >&2

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

@ -17,14 +17,15 @@ version_greater() {
}
setup_ssmtp() {
if [ -n "${FRIENDICA_SITENAME+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
echo "Setup SSMTP for '$FRIENDICA_SITENAME' with '$SMTP' ..."
if [ -n "${HOSTNAME+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
SITENAME="${FRIENDICA_SITENAME:-Friendica Social Network}"
echo "Setup SSMTP for '$SITENAME' with '$SMTP' ..."
smtp_from=${SMTP_FROM:-no-reply}
# Setup SSMTP
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" www-data
# add possible mail-senders
{
@ -117,7 +118,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
if [ "$install" = true ]; then
echo "Waiting for MySQL $MYSQL_HOST initialization..."
if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then
echo "Starting Friendica installation ..."
run_as "php /var/www/html/bin/console.php autoinstall $install_options"

2
2019.12/fpm/cron.sh
View file

@ -6,7 +6,7 @@ while [ ! -f /var/www/html/bin/daemon.php ]; do
done
echo "Waiting for MySQL $MYSQL_HOST initialization..."
if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then
exec php /var/www/html/bin/daemon.php -f start
else
echo "[ERROR] Waited 300 seconds, no response" >&2

11
2019.12/fpm/entrypoint.sh
View file

@ -17,14 +17,15 @@ version_greater() {
}
setup_ssmtp() {
if [ -n "${FRIENDICA_SITENAME+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
echo "Setup SSMTP for '$FRIENDICA_SITENAME' with '$SMTP' ..."
if [ -n "${HOSTNAME+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
SITENAME="${FRIENDICA_SITENAME:-Friendica Social Network}"
echo "Setup SSMTP for '$SITENAME' with '$SMTP' ..."
smtp_from=${SMTP_FROM:-no-reply}
# Setup SSMTP
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" www-data
# add possible mail-senders
{
@ -117,7 +118,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
if [ "$install" = true ]; then
echo "Waiting for MySQL $MYSQL_HOST initialization..."
if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then
echo "Starting Friendica installation ..."
run_as "php /var/www/html/bin/console.php autoinstall $install_options"

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

@ -6,7 +6,7 @@ while [ ! -f /var/www/html/bin/daemon.php ]; do
done
echo "Waiting for MySQL $MYSQL_HOST initialization..."
if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then
exec php /var/www/html/bin/daemon.php -f start
else
echo "[ERROR] Waited 300 seconds, no response" >&2

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

@ -17,14 +17,15 @@ version_greater() {
}
setup_ssmtp() {
if [ -n "${FRIENDICA_SITENAME+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
echo "Setup SSMTP for '$FRIENDICA_SITENAME' with '$SMTP' ..."
if [ -n "${HOSTNAME+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
SITENAME="${FRIENDICA_SITENAME:-Friendica Social Network}"
echo "Setup SSMTP for '$SITENAME' with '$SMTP' ..."
smtp_from=${SMTP_FROM:-no-reply}
# Setup SSMTP
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" www-data
# add possible mail-senders
{
@ -117,7 +118,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
if [ "$install" = true ]; then
echo "Waiting for MySQL $MYSQL_HOST initialization..."
if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then
echo "Starting Friendica installation ..."
run_as "php /var/www/html/bin/console.php autoinstall $install_options"

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

@ -6,7 +6,7 @@ while [ ! -f /var/www/html/bin/daemon.php ]; do
done
echo "Waiting for MySQL $MYSQL_HOST initialization..."
if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then
exec php /var/www/html/bin/daemon.php -f start
else
echo "[ERROR] Waited 300 seconds, no response" >&2

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

@ -17,14 +17,15 @@ version_greater() {
}
setup_ssmtp() {
if [ -n "${FRIENDICA_SITENAME+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
echo "Setup SSMTP for '$FRIENDICA_SITENAME' with '$SMTP' ..."
if [ -n "${HOSTNAME+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
SITENAME="${FRIENDICA_SITENAME:-Friendica Social Network}"
echo "Setup SSMTP for '$SITENAME' with '$SMTP' ..."
smtp_from=${SMTP_FROM:-no-reply}
# Setup SSMTP
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" www-data
# add possible mail-senders
{
@ -117,7 +118,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
if [ "$install" = true ]; then
echo "Waiting for MySQL $MYSQL_HOST initialization..."
if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then
echo "Starting Friendica installation ..."
run_as "php /var/www/html/bin/console.php autoinstall $install_options"

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

@ -6,7 +6,7 @@ while [ ! -f /var/www/html/bin/daemon.php ]; do
done
echo "Waiting for MySQL $MYSQL_HOST initialization..."
if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then
exec php /var/www/html/bin/daemon.php -f start
else
echo "[ERROR] Waited 300 seconds, no response" >&2

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

@ -17,14 +17,15 @@ version_greater() {
}
setup_ssmtp() {
if [ -n "${FRIENDICA_SITENAME+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
echo "Setup SSMTP for '$FRIENDICA_SITENAME' with '$SMTP' ..."
if [ -n "${HOSTNAME+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
SITENAME="${FRIENDICA_SITENAME:-Friendica Social Network}"
echo "Setup SSMTP for '$SITENAME' with '$SMTP' ..."
smtp_from=${SMTP_FROM:-no-reply}
# Setup SSMTP
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" www-data
# add possible mail-senders
{
@ -117,7 +118,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
if [ "$install" = true ]; then
echo "Waiting for MySQL $MYSQL_HOST initialization..."
if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then
echo "Starting Friendica installation ..."
run_as "php /var/www/html/bin/console.php autoinstall $install_options"

2
docker-cron.sh
View file

@ -6,7 +6,7 @@ while [ ! -f /var/www/html/bin/daemon.php ]; do
done
echo "Waiting for MySQL $MYSQL_HOST initialization..."
if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then
exec php /var/www/html/bin/daemon.php -f start
else
echo "[ERROR] Waited 300 seconds, no response" >&2

11
docker-entrypoint.sh
View file

@ -17,14 +17,15 @@ version_greater() {
}
setup_ssmtp() {
if [ -n "${FRIENDICA_SITENAME+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
echo "Setup SSMTP for '$FRIENDICA_SITENAME' with '$SMTP' ..."
if [ -n "${HOSTNAME+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" ]; then
SITENAME="${FRIENDICA_SITENAME:-Friendica Social Network}"
echo "Setup SSMTP for '$SITENAME' with '$SMTP' ..."
smtp_from=${SMTP_FROM:-no-reply}
# Setup SSMTP
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" www-data
# add possible mail-senders
{
@ -117,7 +118,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
if [ "$install" = true ]; then
echo "Waiting for MySQL $MYSQL_HOST initialization..."
if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
if run_as "php /var/www/html/bin/wait-for-connection $MYSQL_HOST ${MYSQL_PORT:-3306} 300"; then
echo "Starting Friendica installation ..."
run_as "php /var/www/html/bin/console.php autoinstall $install_options"