From eea8fbdd84f7d33ce6edcaf73f26666633508d24 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Wed, 1 Jan 2020 15:16:13 +0100 Subject: [PATCH] Fix dev update --- 2019.12/apache/entrypoint.sh | 4 ++-- 2019.12/fpm-alpine/entrypoint.sh | 4 ++-- 2019.12/fpm/entrypoint.sh | 4 ++-- 2020.03-dev/apache/entrypoint.sh | 4 ++-- 2020.03-dev/fpm-alpine/entrypoint.sh | 4 ++-- 2020.03-dev/fpm/entrypoint.sh | 4 ++-- docker-entrypoint.sh | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/2019.12/apache/entrypoint.sh b/2019.12/apache/entrypoint.sh index a2751d1..626ce23 100755 --- a/2019.12/apache/entrypoint.sh +++ b/2019.12/apache/entrypoint.sh @@ -66,8 +66,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then setup_ssmtp - # check it just in case the version is greater - if version_greater "$image_version" "$installed_version"; then + # 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 echo "Initializing Friendica $image_version ..." if [ "$installed_version" != "0.0.0.0" ]; then diff --git a/2019.12/fpm-alpine/entrypoint.sh b/2019.12/fpm-alpine/entrypoint.sh index a2751d1..626ce23 100755 --- a/2019.12/fpm-alpine/entrypoint.sh +++ b/2019.12/fpm-alpine/entrypoint.sh @@ -66,8 +66,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then setup_ssmtp - # check it just in case the version is greater - if version_greater "$image_version" "$installed_version"; then + # 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 echo "Initializing Friendica $image_version ..." if [ "$installed_version" != "0.0.0.0" ]; then diff --git a/2019.12/fpm/entrypoint.sh b/2019.12/fpm/entrypoint.sh index a2751d1..626ce23 100755 --- a/2019.12/fpm/entrypoint.sh +++ b/2019.12/fpm/entrypoint.sh @@ -66,8 +66,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then setup_ssmtp - # check it just in case the version is greater - if version_greater "$image_version" "$installed_version"; then + # 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 echo "Initializing Friendica $image_version ..." if [ "$installed_version" != "0.0.0.0" ]; then diff --git a/2020.03-dev/apache/entrypoint.sh b/2020.03-dev/apache/entrypoint.sh index a2751d1..626ce23 100755 --- a/2020.03-dev/apache/entrypoint.sh +++ b/2020.03-dev/apache/entrypoint.sh @@ -66,8 +66,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then setup_ssmtp - # check it just in case the version is greater - if version_greater "$image_version" "$installed_version"; then + # 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 echo "Initializing Friendica $image_version ..." if [ "$installed_version" != "0.0.0.0" ]; then diff --git a/2020.03-dev/fpm-alpine/entrypoint.sh b/2020.03-dev/fpm-alpine/entrypoint.sh index a2751d1..626ce23 100755 --- a/2020.03-dev/fpm-alpine/entrypoint.sh +++ b/2020.03-dev/fpm-alpine/entrypoint.sh @@ -66,8 +66,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then setup_ssmtp - # check it just in case the version is greater - if version_greater "$image_version" "$installed_version"; then + # 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 echo "Initializing Friendica $image_version ..." if [ "$installed_version" != "0.0.0.0" ]; then diff --git a/2020.03-dev/fpm/entrypoint.sh b/2020.03-dev/fpm/entrypoint.sh index a2751d1..626ce23 100755 --- a/2020.03-dev/fpm/entrypoint.sh +++ b/2020.03-dev/fpm/entrypoint.sh @@ -66,8 +66,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then setup_ssmtp - # check it just in case the version is greater - if version_greater "$image_version" "$installed_version"; then + # 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 echo "Initializing Friendica $image_version ..." if [ "$installed_version" != "0.0.0.0" ]; then diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index a2751d1..626ce23 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -66,8 +66,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then setup_ssmtp - # check it just in case the version is greater - if version_greater "$image_version" "$installed_version"; then + # 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 echo "Initializing Friendica $image_version ..." if [ "$installed_version" != "0.0.0.0" ]; then