Friendica - Fix Upgrade behavior

[nupplaphil]

FollowUp #11610
Unfortunately I mixed two environment variables - see friendica/docker#182 for details

[github-actions]

Diff for 6c6c80e:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index 6d2dcd5..558e2fe 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -19,30 +19,30 @@ Directory: 2021.09/fpm-alpine
 
 Tags: 2021.12-dev-apache, dev-apache, 2021.12-dev, dev
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 9f8658cf5372dc4ac75a9d5d330d7f35a83ddbdf
+GitCommit: 933e3c5604ff01fe6a2a4d3a23b92effe5e152b0
 Directory: 2021.12-dev/apache
 
 Tags: 2021.12-dev-fpm, dev-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 9f8658cf5372dc4ac75a9d5d330d7f35a83ddbdf
+GitCommit: 933e3c5604ff01fe6a2a4d3a23b92effe5e152b0
 Directory: 2021.12-dev/fpm
 
 Tags: 2021.12-dev-fpm-alpine, dev-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 9f8658cf5372dc4ac75a9d5d330d7f35a83ddbdf
+GitCommit: 933e3c5604ff01fe6a2a4d3a23b92effe5e152b0
 Directory: 2021.12-dev/fpm-alpine
 
 Tags: 2021.12-rc-apache, rc-apache, 2021.12-rc, rc
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 9f8658cf5372dc4ac75a9d5d330d7f35a83ddbdf
+GitCommit: 933e3c5604ff01fe6a2a4d3a23b92effe5e152b0
 Directory: 2021.12-rc/apache
 
 Tags: 2021.12-rc-fpm, rc-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 9f8658cf5372dc4ac75a9d5d330d7f35a83ddbdf
+GitCommit: 933e3c5604ff01fe6a2a4d3a23b92effe5e152b0
 Directory: 2021.12-rc/fpm
 
 Tags: 2021.12-rc-fpm-alpine, rc-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 9f8658cf5372dc4ac75a9d5d330d7f35a83ddbdf
+GitCommit: 933e3c5604ff01fe6a2a4d3a23b92effe5e152b0
 Directory: 2021.12-rc/fpm-alpine
diff --git a/friendica_dev-fpm-alpine/entrypoint-dev.sh b/friendica_dev-fpm-alpine/entrypoint-dev.sh
index 2f2bd3e..8b34c21 100755
--- a/friendica_dev-fpm-alpine/entrypoint-dev.sh
+++ b/friendica_dev-fpm-alpine/entrypoint-dev.sh
@@ -2,7 +2,7 @@
 set -eu
 
 # just check if we execute apache or php-fpm
-if (expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]) && [ "${FRIENDICA_DISABLE_UPGRADE:-false}" = "false" ]; then
+if (expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]) && [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
   curl -fsSL -o "/usr/src/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256" "https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256"
   curl -fsSL -o "/usr/src/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256" "https://files.friendi.ca/friendica-full-${FRIENDICA_ADDONS}.tar.gz.sum256"
 
diff --git a/friendica_dev-fpm/entrypoint-dev.sh b/friendica_dev-fpm/entrypoint-dev.sh
index 2f2bd3e..8b34c21 100755
--- a/friendica_dev-fpm/entrypoint-dev.sh
+++ b/friendica_dev-fpm/entrypoint-dev.sh
@@ -2,7 +2,7 @@
 set -eu
 
 # just check if we execute apache or php-fpm
-if (expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]) && [ "${FRIENDICA_DISABLE_UPGRADE:-false}" = "false" ]; then
+if (expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]) && [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
   curl -fsSL -o "/usr/src/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256" "https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256"
   curl -fsSL -o "/usr/src/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256" "https://files.friendi.ca/friendica-full-${FRIENDICA_ADDONS}.tar.gz.sum256"
 
diff --git a/friendica_dev/entrypoint-dev.sh b/friendica_dev/entrypoint-dev.sh
index 2f2bd3e..8b34c21 100755
--- a/friendica_dev/entrypoint-dev.sh
+++ b/friendica_dev/entrypoint-dev.sh
@@ -2,7 +2,7 @@
 set -eu
 
 # just check if we execute apache or php-fpm
-if (expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]) && [ "${FRIENDICA_DISABLE_UPGRADE:-false}" = "false" ]; then
+if (expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]) && [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
   curl -fsSL -o "/usr/src/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256" "https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256"
   curl -fsSL -o "/usr/src/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256" "https://files.friendi.ca/friendica-full-${FRIENDICA_ADDONS}.tar.gz.sum256"
 
diff --git a/friendica_rc-fpm-alpine/entrypoint-dev.sh b/friendica_rc-fpm-alpine/entrypoint-dev.sh
index 2f2bd3e..8b34c21 100755
--- a/friendica_rc-fpm-alpine/entrypoint-dev.sh
+++ b/friendica_rc-fpm-alpine/entrypoint-dev.sh
@@ -2,7 +2,7 @@
 set -eu
 
 # just check if we execute apache or php-fpm
-if (expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]) && [ "${FRIENDICA_DISABLE_UPGRADE:-false}" = "false" ]; then
+if (expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]) && [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
   curl -fsSL -o "/usr/src/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256" "https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256"
   curl -fsSL -o "/usr/src/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256" "https://files.friendi.ca/friendica-full-${FRIENDICA_ADDONS}.tar.gz.sum256"
 
diff --git a/friendica_rc-fpm/entrypoint-dev.sh b/friendica_rc-fpm/entrypoint-dev.sh
index 2f2bd3e..8b34c21 100755
--- a/friendica_rc-fpm/entrypoint-dev.sh
+++ b/friendica_rc-fpm/entrypoint-dev.sh
@@ -2,7 +2,7 @@
 set -eu
 
 # just check if we execute apache or php-fpm
-if (expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]) && [ "${FRIENDICA_DISABLE_UPGRADE:-false}" = "false" ]; then
+if (expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]) && [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
   curl -fsSL -o "/usr/src/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256" "https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256"
   curl -fsSL -o "/usr/src/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256" "https://files.friendi.ca/friendica-full-${FRIENDICA_ADDONS}.tar.gz.sum256"
 
diff --git a/friendica_rc/entrypoint-dev.sh b/friendica_rc/entrypoint-dev.sh
index 2f2bd3e..8b34c21 100755
--- a/friendica_rc/entrypoint-dev.sh
+++ b/friendica_rc/entrypoint-dev.sh
@@ -2,7 +2,7 @@
 set -eu
 
 # just check if we execute apache or php-fpm
-if (expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]) && [ "${FRIENDICA_DISABLE_UPGRADE:-false}" = "false" ]; then
+if (expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]) && [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
   curl -fsSL -o "/usr/src/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256" "https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256"
   curl -fsSL -o "/usr/src/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256" "https://files.friendi.ca/friendica-full-${FRIENDICA_ADDONS}.tar.gz.sum256"

Relevant Maintainers:

• friendica: @friendica @nupplaphil