From 170cb93806ae874a33c62e63976f8594545c6a18 Mon Sep 17 00:00:00 2001 From: Simon L Date: Wed, 6 Sep 2023 16:13:36 +0200 Subject: [PATCH 1/3] rename app_ecosystem_v2 to app_api Signed-off-by: Simon L --- Containers/nextcloud/entrypoint.sh | 14 +++++++------- php/templates/containers.twig | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Containers/nextcloud/entrypoint.sh b/Containers/nextcloud/entrypoint.sh index 321a8511fe8..f58f94ca24b 100644 --- a/Containers/nextcloud/entrypoint.sh +++ b/Containers/nextcloud/entrypoint.sh @@ -739,16 +739,16 @@ fi # Docker socket proxy if version_greater "$installed_version" "27.1.0.0"; then if [ "$DOCKER_SOCKET_PROXY_ENABLED" = 'yes' ]; then - if ! [ -d "/var/www/html/custom_apps/app_ecosystem_v2" ]; then - php /var/www/html/occ app:install app_ecosystem_v2 - elif [ "$(php /var/www/html/occ config:app:get app_ecosystem_v2 enabled)" != "yes" ]; then - php /var/www/html/occ app:enable app_ecosystem_v2 + if ! [ -d "/var/www/html/custom_apps/app_api" ]; then + php /var/www/html/occ app:install app_api + elif [ "$(php /var/www/html/occ config:app:get app_api enabled)" != "yes" ]; then + php /var/www/html/occ app:enable app_api elif [ "$SKIP_UPDATE" != 1 ]; then - php /var/www/html/occ app:update app_ecosystem_v2 + php /var/www/html/occ app:update app_api fi else - if [ "$REMOVE_DISABLED_APPS" = yes ] && [ -d "/var/www/html/custom_apps/app_ecosystem_v2" ]; then - php /var/www/html/occ app:remove app_ecosystem_v2 + if [ "$REMOVE_DISABLED_APPS" = yes ] && [ -d "/var/www/html/custom_apps/app_api" ]; then + php /var/www/html/occ app:remove app_api fi fi fi diff --git a/php/templates/containers.twig b/php/templates/containers.twig index a250dfd3d59..c2242db28a6 100644 --- a/php/templates/containers.twig +++ b/php/templates/containers.twig @@ -575,9 +575,9 @@ {#
#} {% endif %} {% if is_docker_socket_proxy_enabled == true %} -

+

{% else %} - {#

#} + {#

#} {% endif %} From 5d9c6705c4103b6fad5061501ba10d7347fb4189 Mon Sep 17 00:00:00 2001 From: Simon L Date: Wed, 6 Sep 2023 16:20:45 +0200 Subject: [PATCH 2/3] rename to app api Signed-off-by: Simon L --- php/templates/containers.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/php/templates/containers.twig b/php/templates/containers.twig index c2242db28a6..151abbfab3f 100644 --- a/php/templates/containers.twig +++ b/php/templates/containers.twig @@ -575,9 +575,9 @@ {#
#} {% endif %} {% if is_docker_socket_proxy_enabled == true %} -

+

{% else %} - {#

#} + {#

#} {% endif %} From b7c7720244bc29b8b76f27fc5628fa9d44f032c9 Mon Sep 17 00:00:00 2001 From: Simon L Date: Mon, 11 Sep 2023 13:29:48 +0200 Subject: [PATCH 3/3] adjust links Signed-off-by: Simon L --- php/templates/containers.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/php/templates/containers.twig b/php/templates/containers.twig index 151abbfab3f..ccfa8ec9ad4 100644 --- a/php/templates/containers.twig +++ b/php/templates/containers.twig @@ -575,9 +575,9 @@ {#
#} {% endif %} {% if is_docker_socket_proxy_enabled == true %} -

+

{% else %} - {#

#} + {#

#} {% endif %}