From 677134a7f962c70717558a50aad0b1619945d6be Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Thu, 16 Aug 2018 18:06:04 +0200 Subject: [PATCH 1/2] Remove the "--no-app-disable" option form the "occ upgrade" command Signed-off-by: Tilo Spannagel --- docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 2ad63ec4..5a580142 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -50,7 +50,7 @@ if version_greater "$image_version" "$installed_version"; then done if [ "$installed_version" != "0.0.0.0" ]; then - run_as 'php /var/www/html/occ upgrade --no-app-disable' + run_as 'php /var/www/html/occ upgrade' run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_after echo "The following apps have beed disabled:" From 1654a164dc1a7f6e01f418dcf8b5e2c48f08f708 Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Thu, 16 Aug 2018 18:10:27 +0200 Subject: [PATCH 2/2] Run update.sh Signed-off-by: Tilo Spannagel --- 12.0/apache/entrypoint.sh | 2 +- 12.0/fpm-alpine/entrypoint.sh | 2 +- 12.0/fpm/entrypoint.sh | 2 +- 13.0/apache/entrypoint.sh | 2 +- 13.0/fpm-alpine/entrypoint.sh | 2 +- 13.0/fpm/entrypoint.sh | 2 +- 14.0-beta/apache/entrypoint.sh | 2 +- 14.0-beta/fpm-alpine/entrypoint.sh | 2 +- 14.0-beta/fpm/entrypoint.sh | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/12.0/apache/entrypoint.sh b/12.0/apache/entrypoint.sh index 2ad63ec4..5a580142 100755 --- a/12.0/apache/entrypoint.sh +++ b/12.0/apache/entrypoint.sh @@ -50,7 +50,7 @@ if version_greater "$image_version" "$installed_version"; then done if [ "$installed_version" != "0.0.0.0" ]; then - run_as 'php /var/www/html/occ upgrade --no-app-disable' + run_as 'php /var/www/html/occ upgrade' run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_after echo "The following apps have beed disabled:" diff --git a/12.0/fpm-alpine/entrypoint.sh b/12.0/fpm-alpine/entrypoint.sh index 2ad63ec4..5a580142 100755 --- a/12.0/fpm-alpine/entrypoint.sh +++ b/12.0/fpm-alpine/entrypoint.sh @@ -50,7 +50,7 @@ if version_greater "$image_version" "$installed_version"; then done if [ "$installed_version" != "0.0.0.0" ]; then - run_as 'php /var/www/html/occ upgrade --no-app-disable' + run_as 'php /var/www/html/occ upgrade' run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_after echo "The following apps have beed disabled:" diff --git a/12.0/fpm/entrypoint.sh b/12.0/fpm/entrypoint.sh index 2ad63ec4..5a580142 100755 --- a/12.0/fpm/entrypoint.sh +++ b/12.0/fpm/entrypoint.sh @@ -50,7 +50,7 @@ if version_greater "$image_version" "$installed_version"; then done if [ "$installed_version" != "0.0.0.0" ]; then - run_as 'php /var/www/html/occ upgrade --no-app-disable' + run_as 'php /var/www/html/occ upgrade' run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_after echo "The following apps have beed disabled:" diff --git a/13.0/apache/entrypoint.sh b/13.0/apache/entrypoint.sh index 2ad63ec4..5a580142 100755 --- a/13.0/apache/entrypoint.sh +++ b/13.0/apache/entrypoint.sh @@ -50,7 +50,7 @@ if version_greater "$image_version" "$installed_version"; then done if [ "$installed_version" != "0.0.0.0" ]; then - run_as 'php /var/www/html/occ upgrade --no-app-disable' + run_as 'php /var/www/html/occ upgrade' run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_after echo "The following apps have beed disabled:" diff --git a/13.0/fpm-alpine/entrypoint.sh b/13.0/fpm-alpine/entrypoint.sh index 2ad63ec4..5a580142 100755 --- a/13.0/fpm-alpine/entrypoint.sh +++ b/13.0/fpm-alpine/entrypoint.sh @@ -50,7 +50,7 @@ if version_greater "$image_version" "$installed_version"; then done if [ "$installed_version" != "0.0.0.0" ]; then - run_as 'php /var/www/html/occ upgrade --no-app-disable' + run_as 'php /var/www/html/occ upgrade' run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_after echo "The following apps have beed disabled:" diff --git a/13.0/fpm/entrypoint.sh b/13.0/fpm/entrypoint.sh index 2ad63ec4..5a580142 100755 --- a/13.0/fpm/entrypoint.sh +++ b/13.0/fpm/entrypoint.sh @@ -50,7 +50,7 @@ if version_greater "$image_version" "$installed_version"; then done if [ "$installed_version" != "0.0.0.0" ]; then - run_as 'php /var/www/html/occ upgrade --no-app-disable' + run_as 'php /var/www/html/occ upgrade' run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_after echo "The following apps have beed disabled:" diff --git a/14.0-beta/apache/entrypoint.sh b/14.0-beta/apache/entrypoint.sh index 2ad63ec4..5a580142 100755 --- a/14.0-beta/apache/entrypoint.sh +++ b/14.0-beta/apache/entrypoint.sh @@ -50,7 +50,7 @@ if version_greater "$image_version" "$installed_version"; then done if [ "$installed_version" != "0.0.0.0" ]; then - run_as 'php /var/www/html/occ upgrade --no-app-disable' + run_as 'php /var/www/html/occ upgrade' run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_after echo "The following apps have beed disabled:" diff --git a/14.0-beta/fpm-alpine/entrypoint.sh b/14.0-beta/fpm-alpine/entrypoint.sh index 2ad63ec4..5a580142 100755 --- a/14.0-beta/fpm-alpine/entrypoint.sh +++ b/14.0-beta/fpm-alpine/entrypoint.sh @@ -50,7 +50,7 @@ if version_greater "$image_version" "$installed_version"; then done if [ "$installed_version" != "0.0.0.0" ]; then - run_as 'php /var/www/html/occ upgrade --no-app-disable' + run_as 'php /var/www/html/occ upgrade' run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_after echo "The following apps have beed disabled:" diff --git a/14.0-beta/fpm/entrypoint.sh b/14.0-beta/fpm/entrypoint.sh index 2ad63ec4..5a580142 100755 --- a/14.0-beta/fpm/entrypoint.sh +++ b/14.0-beta/fpm/entrypoint.sh @@ -50,7 +50,7 @@ if version_greater "$image_version" "$installed_version"; then done if [ "$installed_version" != "0.0.0.0" ]; then - run_as 'php /var/www/html/occ upgrade --no-app-disable' + run_as 'php /var/www/html/occ upgrade' run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_after echo "The following apps have beed disabled:"