From 02ccf8578214e78f9d918d461526448545fbcaf2 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 8 Mar 2024 17:20:10 +0100 Subject: [PATCH 1/3] fix: usage containers --- app/console | 2 +- app/views/install/compose.phtml | 32 +++++++++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/app/console b/app/console index 8e7eb7e337..5ac6eb5585 160000 --- a/app/console +++ b/app/console @@ -1 +1 @@ -Subproject commit 8e7eb7e337ddd1c9e14c7c93008a2b871bda70ad +Subproject commit 5ac6eb5585b3294493588823a2e15bca15494669 diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml index 0136dc664e..95b62fcadf 100644 --- a/app/views/install/compose.phtml +++ b/app/views/install/compose.phtml @@ -600,13 +600,14 @@ services: appwrite-worker-usage: image: /: - entrypoint: usage + entrypoint: entrypoint: worker-usage container_name: appwrite-worker-usage <<: *x-logging restart: unless-stopped networks: - appwrite depends_on: + - redis - mariadb environment: - _APP_ENV @@ -624,6 +625,35 @@ services: - _APP_USAGE_STATS - _APP_LOGGING_PROVIDER - _APP_LOGGING_CONFIG + - _APP_USAGE_AGGREGATION_INTERVAL + + appwrite-worker-usage-dump: + image: /: + entrypoint: worker-usage-dump + <<: *x-logging + container_name: appwrite-worker-usage-dump + networks: + - appwrite + depends_on: + - redis + - mariadb + environment: + - _APP_ENV + - _APP_WORKER_PER_CORE + - _APP_OPENSSL_KEY_V1 + - _APP_DB_HOST + - _APP_DB_PORT + - _APP_DB_SCHEMA + - _APP_DB_USER + - _APP_DB_PASS + - _APP_REDIS_HOST + - _APP_REDIS_PORT + - _APP_REDIS_USER + - _APP_REDIS_PASS + - _APP_USAGE_STATS + - _APP_LOGGING_PROVIDER + - _APP_LOGGING_CONFIG + - _APP_USAGE_AGGREGATION_INTERVAL appwrite-scheduler-functions: image: /: From 5b9287da81ee155c4355a3956e4b81bdce087323 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 8 Mar 2024 17:22:07 +0100 Subject: [PATCH 2/3] fix: type --- app/console | 2 +- app/views/install/compose.phtml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/console b/app/console index 5ac6eb5585..8e7eb7e337 160000 --- a/app/console +++ b/app/console @@ -1 +1 @@ -Subproject commit 5ac6eb5585b3294493588823a2e15bca15494669 +Subproject commit 8e7eb7e337ddd1c9e14c7c93008a2b871bda70ad diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml index 95b62fcadf..354ef4ea49 100644 --- a/app/views/install/compose.phtml +++ b/app/views/install/compose.phtml @@ -600,7 +600,7 @@ services: appwrite-worker-usage: image: /: - entrypoint: entrypoint: worker-usage + entrypoint: worker-usage container_name: appwrite-worker-usage <<: *x-logging restart: unless-stopped From 150681246e87014431fe1bdec6e81ae5a009ce31 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 8 Mar 2024 17:25:10 +0100 Subject: [PATCH 3/3] bump: version number --- app/init.php | 2 +- src/Appwrite/Migration/Migration.php | 1 + src/Appwrite/Platform/Tasks/SDKs.php | 14 +++++++------- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/init.php b/app/init.php index f09c97a9b4..c749c8a28d 100644 --- a/app/init.php +++ b/app/init.php @@ -112,7 +112,7 @@ const APP_KEY_ACCCESS = 24 * 60 * 60; // 24 hours const APP_USER_ACCCESS = 24 * 60 * 60; // 24 hours const APP_CACHE_UPDATE = 24 * 60 * 60; // 24 hours const APP_CACHE_BUSTER = 331; -const APP_VERSION_STABLE = '1.5.0'; +const APP_VERSION_STABLE = '1.5.1'; const APP_DATABASE_ATTRIBUTE_EMAIL = 'email'; const APP_DATABASE_ATTRIBUTE_ENUM = 'enum'; const APP_DATABASE_ATTRIBUTE_IP = 'ip'; diff --git a/src/Appwrite/Migration/Migration.php b/src/Appwrite/Migration/Migration.php index cbcc7a9322..7e2e157bf9 100644 --- a/src/Appwrite/Migration/Migration.php +++ b/src/Appwrite/Migration/Migration.php @@ -79,6 +79,7 @@ abstract class Migration '1.4.12' => 'V19', '1.4.13' => 'V19', '1.5.0' => 'V20', + '1.5.1' => 'V20', ]; /** diff --git a/src/Appwrite/Platform/Tasks/SDKs.php b/src/Appwrite/Platform/Tasks/SDKs.php index 014e33109e..d5168ea91c 100644 --- a/src/Appwrite/Platform/Tasks/SDKs.php +++ b/src/Appwrite/Platform/Tasks/SDKs.php @@ -115,20 +115,20 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND $config->setNPMPackage('appwrite-cli'); $config->setExecutableName('appwrite'); $config->setLogo(json_encode(" - _ _ _ ___ __ _____ + _ _ _ ___ __ _____ /_\ _ __ _ ____ ___ __(_) |_ ___ / __\ / / \_ \ //_\\\| '_ \| '_ \ \ /\ / / '__| | __/ _ \ / / / / / /\/ - / _ \ |_) | |_) \ V V /| | | | || __/ / /___/ /___/\/ /_ - \_/ \_/ .__/| .__/ \_/\_/ |_| |_|\__\___| \____/\____/\____/ - |_| |_| + / _ \ |_) | |_) \ V V /| | | | || __/ / /___/ /___/\/ /_ + \_/ \_/ .__/| .__/ \_/\_/ |_| |_|\__\___| \____/\____/\____/ + |_| |_| ")); $config->setLogoUnescaped(" - _ _ _ ___ __ _____ + _ _ _ ___ __ _____ /_\ _ __ _ ____ ___ __(_) |_ ___ / __\ / / \_ \ //_\\\| '_ \| '_ \ \ /\ / / '__| | __/ _ \ / / / / / /\/ - / _ \ |_) | |_) \ V V /| | | | || __/ / /___/ /___/\/ /_ - \_/ \_/ .__/| .__/ \_/\_/ |_| |_|\__\___| \____/\____/\____/ + / _ \ |_) | |_) \ V V /| | | | || __/ / /___/ /___/\/ /_ + \_/ \_/ .__/| .__/ \_/\_/ |_| |_|\__\___| \____/\____/\____/ |_| |_| "); break; case 'php':