From 2127afd047fb0b7e5120d5486625cdaa05f44104 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Sun, 23 Jul 2023 07:29:30 +0000 Subject: [PATCH 1/9] test updated docker-base version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 27323b6dba..496726748b 100755 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,7 @@ ENV VITE_APPWRITE_GROWTH_ENDPOINT=$VITE_APPWRITE_GROWTH_ENDPOINT RUN npm ci RUN npm run build -FROM appwrite/base:0.2.2 as final +FROM dlohani/appwrite_base:upgrade as final LABEL maintainer="team@appwrite.io" From a8b3367d506952dad56f747761e1ac28ec67dcd2 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 25 Jul 2023 06:05:22 +0000 Subject: [PATCH 2/9] upgrade utopia-swoole version --- composer.json | 4 ++-- composer.lock | 47 +++++++++++++++++++++++++---------------------- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/composer.json b/composer.json index 8070096898..51fbd6f1ff 100644 --- a/composer.json +++ b/composer.json @@ -60,7 +60,7 @@ "utopia-php/preloader": "0.2.*", "utopia-php/registry": "0.5.*", "utopia-php/storage": "0.14.*", - "utopia-php/swoole": "0.5.*", + "utopia-php/swoole": "dev-feat-framework-upgrade", "utopia-php/websocket": "0.1.*", "resque/php-resque": "1.3.6", "matomo/device-detector": "6.1.*", @@ -83,7 +83,7 @@ "ext-fileinfo": "*", "phpunit/phpunit": "9.5.20", "squizlabs/php_codesniffer": "^3.6", - "swoole/ide-helper": "4.8.9", + "swoole/ide-helper": "5.0.0", "textalk/websocket": "1.5.7" }, "provide": { diff --git a/composer.lock b/composer.lock index 5a25c90dc4..df9fd8487d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c41be9b81d4ee69cf915be4c7ba37975", + "content-hash": "78f2e6a5a1260370b460be5c3d266580", "packages": [ { "name": "adhocore/jwt", @@ -2740,27 +2740,28 @@ }, { "name": "utopia-php/swoole", - "version": "0.5.0", + "version": "dev-feat-framework-upgrade", "source": { "type": "git", "url": "https://github.com/utopia-php/swoole.git", - "reference": "c2a3a4f944a2f22945af3cbcb95b13f0769628b1" + "reference": "0dc187fdd60266db1d7c93a185ee634d37b5f5c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/swoole/zipball/c2a3a4f944a2f22945af3cbcb95b13f0769628b1", - "reference": "c2a3a4f944a2f22945af3cbcb95b13f0769628b1", + "url": "https://api.github.com/repos/utopia-php/swoole/zipball/0dc187fdd60266db1d7c93a185ee634d37b5f5c5", + "reference": "0dc187fdd60266db1d7c93a185ee634d37b5f5c5", "shasum": "" }, "require": { "ext-swoole": "*", "php": ">=8.0", - "utopia-php/framework": "0.*.*" + "utopia-php/framework": "0.28.*" }, "require-dev": { "laravel/pint": "1.2.*", + "phpstan/phpstan": "1.9.x-dev", "phpunit/phpunit": "^9.3", - "swoole/ide-helper": "4.8.3", + "swoole/ide-helper": "5.0.0", "vimeo/psalm": "4.15.0" }, "type": "library", @@ -2785,9 +2786,9 @@ ], "support": { "issues": "https://github.com/utopia-php/swoole/issues", - "source": "https://github.com/utopia-php/swoole/tree/0.5.0" + "source": "https://github.com/utopia-php/swoole/tree/feat-framework-upgrade" }, - "time": "2022-10-19T22:19:07+00:00" + "time": "2023-07-25T06:04:40+00:00" }, { "name": "utopia-php/system", @@ -3785,16 +3786,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.22.1", + "version": "1.23.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "65c39594fbd8c67abfc68bb323f86447bab79cc0" + "reference": "a2b24135c35852b348894320d47b3902a94bc494" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/65c39594fbd8c67abfc68bb323f86447bab79cc0", - "reference": "65c39594fbd8c67abfc68bb323f86447bab79cc0", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/a2b24135c35852b348894320d47b3902a94bc494", + "reference": "a2b24135c35852b348894320d47b3902a94bc494", "shasum": "" }, "require": { @@ -3826,9 +3827,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.22.1" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.23.0" }, - "time": "2023-06-29T20:46:06+00:00" + "time": "2023-07-23T22:17:56+00:00" }, { "name": "phpunit/php-code-coverage", @@ -5274,16 +5275,16 @@ }, { "name": "swoole/ide-helper", - "version": "4.8.9", + "version": "5.0.0", "source": { "type": "git", "url": "https://github.com/swoole/ide-helper.git", - "reference": "8f82ba3b6af04a5bccb97c1654af992d1ee8b0fe" + "reference": "939352ede9e8cddce96897d18b4fbd0c1e2110a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swoole/ide-helper/zipball/8f82ba3b6af04a5bccb97c1654af992d1ee8b0fe", - "reference": "8f82ba3b6af04a5bccb97c1654af992d1ee8b0fe", + "url": "https://api.github.com/repos/swoole/ide-helper/zipball/939352ede9e8cddce96897d18b4fbd0c1e2110a3", + "reference": "939352ede9e8cddce96897d18b4fbd0c1e2110a3", "shasum": "" }, "type": "library", @@ -5300,7 +5301,7 @@ "description": "IDE help files for Swoole.", "support": { "issues": "https://github.com/swoole/ide-helper/issues", - "source": "https://github.com/swoole/ide-helper/tree/4.8.9" + "source": "https://github.com/swoole/ide-helper/tree/5.0.0" }, "funding": [ { @@ -5312,7 +5313,7 @@ "type": "github" } ], - "time": "2022-04-18T20:38:04+00:00" + "time": "2022-08-10T05:32:06+00:00" }, { "name": "symfony/polyfill-ctype", @@ -5652,7 +5653,9 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": { + "utopia-php/swoole": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": { From 8f25c5bff13b6182e29e1871f55e4d6746278853 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 25 Jul 2023 09:04:11 +0000 Subject: [PATCH 3/9] upgrade swoole ide helper --- composer.json | 2 +- composer.lock | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 51fbd6f1ff..2cb62ac238 100644 --- a/composer.json +++ b/composer.json @@ -83,7 +83,7 @@ "ext-fileinfo": "*", "phpunit/phpunit": "9.5.20", "squizlabs/php_codesniffer": "^3.6", - "swoole/ide-helper": "5.0.0", + "swoole/ide-helper": "5.0.2", "textalk/websocket": "1.5.7" }, "provide": { diff --git a/composer.lock b/composer.lock index df9fd8487d..5a4126d6cf 100644 --- a/composer.lock +++ b/composer.lock @@ -2744,12 +2744,12 @@ "source": { "type": "git", "url": "https://github.com/utopia-php/swoole.git", - "reference": "0dc187fdd60266db1d7c93a185ee634d37b5f5c5" + "reference": "8c2f8a52d0b6153d1b23fde39d6b4cc688fcb9ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/swoole/zipball/0dc187fdd60266db1d7c93a185ee634d37b5f5c5", - "reference": "0dc187fdd60266db1d7c93a185ee634d37b5f5c5", + "url": "https://api.github.com/repos/utopia-php/swoole/zipball/8c2f8a52d0b6153d1b23fde39d6b4cc688fcb9ed", + "reference": "8c2f8a52d0b6153d1b23fde39d6b4cc688fcb9ed", "shasum": "" }, "require": { @@ -2759,10 +2759,9 @@ }, "require-dev": { "laravel/pint": "1.2.*", - "phpstan/phpstan": "1.9.x-dev", + "phpstan/phpstan": "1.10.26", "phpunit/phpunit": "^9.3", - "swoole/ide-helper": "5.0.0", - "vimeo/psalm": "4.15.0" + "swoole/ide-helper": "5.0.0" }, "type": "library", "autoload": { @@ -2788,7 +2787,7 @@ "issues": "https://github.com/utopia-php/swoole/issues", "source": "https://github.com/utopia-php/swoole/tree/feat-framework-upgrade" }, - "time": "2023-07-25T06:04:40+00:00" + "time": "2023-07-25T07:47:41+00:00" }, { "name": "utopia-php/system", From dc07758f4d53fc17c57b3c4ba774f9245f484684 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 25 Jul 2023 09:10:27 +0000 Subject: [PATCH 4/9] fix composer version --- composer.lock | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/composer.lock b/composer.lock index 5a4126d6cf..fd2245bf28 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "78f2e6a5a1260370b460be5c3d266580", + "content-hash": "7a5fc405fc0dedfc037b7d3e33395d1d", "packages": [ { "name": "adhocore/jwt", @@ -2744,12 +2744,12 @@ "source": { "type": "git", "url": "https://github.com/utopia-php/swoole.git", - "reference": "8c2f8a52d0b6153d1b23fde39d6b4cc688fcb9ed" + "reference": "c636692f65e074343fb9081b88e05eed41d837e7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/swoole/zipball/8c2f8a52d0b6153d1b23fde39d6b4cc688fcb9ed", - "reference": "8c2f8a52d0b6153d1b23fde39d6b4cc688fcb9ed", + "url": "https://api.github.com/repos/utopia-php/swoole/zipball/c636692f65e074343fb9081b88e05eed41d837e7", + "reference": "c636692f65e074343fb9081b88e05eed41d837e7", "shasum": "" }, "require": { @@ -2759,9 +2759,9 @@ }, "require-dev": { "laravel/pint": "1.2.*", - "phpstan/phpstan": "1.10.26", + "phpstan/phpstan": "^1.10", "phpunit/phpunit": "^9.3", - "swoole/ide-helper": "5.0.0" + "swoole/ide-helper": "5.0.2" }, "type": "library", "autoload": { @@ -2787,7 +2787,7 @@ "issues": "https://github.com/utopia-php/swoole/issues", "source": "https://github.com/utopia-php/swoole/tree/feat-framework-upgrade" }, - "time": "2023-07-25T07:47:41+00:00" + "time": "2023-07-25T08:57:25+00:00" }, { "name": "utopia-php/system", @@ -5274,16 +5274,16 @@ }, { "name": "swoole/ide-helper", - "version": "5.0.0", + "version": "5.0.2", "source": { "type": "git", "url": "https://github.com/swoole/ide-helper.git", - "reference": "939352ede9e8cddce96897d18b4fbd0c1e2110a3" + "reference": "16cfee44a6ec92254228c39bcab2fb8ae74cc2ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swoole/ide-helper/zipball/939352ede9e8cddce96897d18b4fbd0c1e2110a3", - "reference": "939352ede9e8cddce96897d18b4fbd0c1e2110a3", + "url": "https://api.github.com/repos/swoole/ide-helper/zipball/16cfee44a6ec92254228c39bcab2fb8ae74cc2ea", + "reference": "16cfee44a6ec92254228c39bcab2fb8ae74cc2ea", "shasum": "" }, "type": "library", @@ -5300,19 +5300,9 @@ "description": "IDE help files for Swoole.", "support": { "issues": "https://github.com/swoole/ide-helper/issues", - "source": "https://github.com/swoole/ide-helper/tree/5.0.0" + "source": "https://github.com/swoole/ide-helper/tree/5.0.2" }, - "funding": [ - { - "url": "https://gitee.com/swoole/swoole?donate=true", - "type": "custom" - }, - { - "url": "https://github.com/swoole", - "type": "github" - } - ], - "time": "2022-08-10T05:32:06+00:00" + "time": "2023-03-20T06:05:55+00:00" }, { "name": "symfony/polyfill-ctype", From bd428fc4360de6abc8ca994db37cc65379e577dd Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 25 Jul 2023 09:37:05 +0000 Subject: [PATCH 5/9] update composer versions --- composer.json | 2 +- composer.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 2cb62ac238..2cd7cbca0d 100644 --- a/composer.json +++ b/composer.json @@ -82,7 +82,7 @@ "appwrite/sdk-generator": "0.33.*", "ext-fileinfo": "*", "phpunit/phpunit": "9.5.20", - "squizlabs/php_codesniffer": "^3.6", + "squizlabs/php_codesniffer": "^3.7", "swoole/ide-helper": "5.0.2", "textalk/websocket": "1.5.7" }, diff --git a/composer.lock b/composer.lock index fd2245bf28..58f06c6ea2 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7a5fc405fc0dedfc037b7d3e33395d1d", + "content-hash": "21c6323d31f4bbae470495c14a35cb41", "packages": [ { "name": "adhocore/jwt", From 844c60f35aba88fb25d5b33357494a1a338c75db Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Wed, 26 Jul 2023 07:23:25 +0000 Subject: [PATCH 6/9] upgrade base image and utopia-swoole --- Dockerfile | 2 +- composer.json | 2 +- composer.lock | 30 ++++++++++++++---------------- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index 496726748b..e5d19f2038 100755 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,7 @@ ENV VITE_APPWRITE_GROWTH_ENDPOINT=$VITE_APPWRITE_GROWTH_ENDPOINT RUN npm ci RUN npm run build -FROM dlohani/appwrite_base:upgrade as final +FROM appwrite/base:0.4.0 as final LABEL maintainer="team@appwrite.io" diff --git a/composer.json b/composer.json index 2cd7cbca0d..511eeff05a 100644 --- a/composer.json +++ b/composer.json @@ -60,7 +60,7 @@ "utopia-php/preloader": "0.2.*", "utopia-php/registry": "0.5.*", "utopia-php/storage": "0.14.*", - "utopia-php/swoole": "dev-feat-framework-upgrade", + "utopia-php/swoole": "0.8.*", "utopia-php/websocket": "0.1.*", "resque/php-resque": "1.3.6", "matomo/device-detector": "6.1.*", diff --git a/composer.lock b/composer.lock index 58f06c6ea2..0537f9b11c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "21c6323d31f4bbae470495c14a35cb41", + "content-hash": "acb2fc370254dfd67f7d44aa1fa0e694", "packages": [ { "name": "adhocore/jwt", @@ -2740,16 +2740,16 @@ }, { "name": "utopia-php/swoole", - "version": "dev-feat-framework-upgrade", + "version": "0.8.0", "source": { "type": "git", "url": "https://github.com/utopia-php/swoole.git", - "reference": "c636692f65e074343fb9081b88e05eed41d837e7" + "reference": "5b60e7f730641cc182bc36b1f9939d4a76d3439b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/swoole/zipball/c636692f65e074343fb9081b88e05eed41d837e7", - "reference": "c636692f65e074343fb9081b88e05eed41d837e7", + "url": "https://api.github.com/repos/utopia-php/swoole/zipball/5b60e7f730641cc182bc36b1f9939d4a76d3439b", + "reference": "5b60e7f730641cc182bc36b1f9939d4a76d3439b", "shasum": "" }, "require": { @@ -2785,9 +2785,9 @@ ], "support": { "issues": "https://github.com/utopia-php/swoole/issues", - "source": "https://github.com/utopia-php/swoole/tree/feat-framework-upgrade" + "source": "https://github.com/utopia-php/swoole/tree/0.8.0" }, - "time": "2023-07-25T08:57:25+00:00" + "time": "2023-07-25T10:29:58+00:00" }, { "name": "utopia-php/system", @@ -5570,16 +5570,16 @@ }, { "name": "twig/twig", - "version": "v3.6.1", + "version": "v3.7.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "7e7d5839d4bec168dfeef0ac66d5c5a2edbabffd" + "reference": "5cf942bbab3df42afa918caeba947f1b690af64b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/7e7d5839d4bec168dfeef0ac66d5c5a2edbabffd", - "reference": "7e7d5839d4bec168dfeef0ac66d5c5a2edbabffd", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/5cf942bbab3df42afa918caeba947f1b690af64b", + "reference": "5cf942bbab3df42afa918caeba947f1b690af64b", "shasum": "" }, "require": { @@ -5625,7 +5625,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.6.1" + "source": "https://github.com/twigphp/Twig/tree/v3.7.0" }, "funding": [ { @@ -5637,14 +5637,12 @@ "type": "tidelift" } ], - "time": "2023-06-08T12:52:13+00:00" + "time": "2023-07-26T07:16:09+00:00" } ], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "utopia-php/swoole": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": { From ba84579a8a6006917899b26017e1de99d3f03c03 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Thu, 27 Jul 2023 00:41:59 +0000 Subject: [PATCH 7/9] update base image version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e5d19f2038..7d23385965 100755 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,7 @@ ENV VITE_APPWRITE_GROWTH_ENDPOINT=$VITE_APPWRITE_GROWTH_ENDPOINT RUN npm ci RUN npm run build -FROM appwrite/base:0.4.0 as final +FROM appwrite/base:0.4.1 as final LABEL maintainer="team@appwrite.io" From 116f459bab4e3690b7dfcb14a4ebf95c468970b8 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Thu, 27 Jul 2023 07:13:37 +0000 Subject: [PATCH 8/9] test swoole 5.0.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7d23385965..f12d0729a7 100755 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,7 @@ ENV VITE_APPWRITE_GROWTH_ENDPOINT=$VITE_APPWRITE_GROWTH_ENDPOINT RUN npm ci RUN npm run build -FROM appwrite/base:0.4.1 as final +FROM dlohani/appwrite_base:upgrades as final LABEL maintainer="team@appwrite.io" From 42e6400660ff16a041c8f2453d3399c359ffe9ea Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Sun, 30 Jul 2023 01:29:18 +0000 Subject: [PATCH 9/9] update base image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f12d0729a7..e08e3dbfbf 100755 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,7 @@ ENV VITE_APPWRITE_GROWTH_ENDPOINT=$VITE_APPWRITE_GROWTH_ENDPOINT RUN npm ci RUN npm run build -FROM dlohani/appwrite_base:upgrades as final +FROM appwrite/base:0.4.2 as final LABEL maintainer="team@appwrite.io"