From 860207ede56ee106f5145b41b62ab87d2187371f Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Fri, 13 Sep 2024 12:54:56 +0000 Subject: [PATCH 1/6] chore: prepare for 1.5.11 releas --- CHANGES.md | 7 +++++++ app/init.php | 4 ++-- app/views/install/compose.phtml | 2 +- docker-compose.yml | 2 +- src/Appwrite/Migration/Migration.php | 1 + 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index e6649d795e..ff447ae5cb 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,10 @@ +# Version 1.5.11 + +## What's Changed + +## Security +- + # Version 1.5.10 ## What's Changed diff --git a/app/init.php b/app/init.php index 3b43d98895..3d1959dc6d 100644 --- a/app/init.php +++ b/app/init.php @@ -112,8 +112,8 @@ const APP_LIMIT_LIST_DEFAULT = 25; // Default maximum number of items to return 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 = 4330; -const APP_VERSION_STABLE = '1.5.10'; +const APP_CACHE_BUSTER = 4331; +const APP_VERSION_STABLE = '1.5.11'; const APP_DATABASE_ATTRIBUTE_EMAIL = 'email'; const APP_DATABASE_ATTRIBUTE_ENUM = 'enum'; const APP_DATABASE_ATTRIBUTE_IP = 'ip'; diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml index 39cc03c8a6..251683067f 100644 --- a/app/views/install/compose.phtml +++ b/app/views/install/compose.phtml @@ -753,7 +753,7 @@ $image = $this->getParam('image', ''); <<: *x-logging restart: unless-stopped stop_signal: SIGINT - image: openruntimes/executor:0.5.7 + image: openruntimes/executor:0.5.8 networks: - appwrite - runtimes diff --git a/docker-compose.yml b/docker-compose.yml index c17f81bddf..feb1928da8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -833,7 +833,7 @@ services: hostname: exc1 <<: *x-logging stop_signal: SIGINT - image: openruntimes/executor:0.5.7 + image: openruntimes/executor:0.5.8 restart: unless-stopped networks: - appwrite diff --git a/src/Appwrite/Migration/Migration.php b/src/Appwrite/Migration/Migration.php index d0bb80d685..1d207f2c90 100644 --- a/src/Appwrite/Migration/Migration.php +++ b/src/Appwrite/Migration/Migration.php @@ -89,6 +89,7 @@ abstract class Migration '1.5.8' => 'V20', '1.5.9' => 'V20', '1.5.10' => 'V20', + '1.5.11' => 'V20' ]; /** From bf45e16066061e3477060a3c6d7a89a8eb40ef62 Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Fri, 13 Sep 2024 12:57:55 +0000 Subject: [PATCH 2/6] chore: update changelog --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index ff447ae5cb..75637ec6bc 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -3,7 +3,7 @@ ## What's Changed ## Security -- +- Bump executor to 0.5.8 [#8661](https://github.com/appwrite/appwrite/pull/8661) # Version 1.5.10 From 3994a965d90371e5d9593a82d32eab956d4a66dd Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Fri, 13 Sep 2024 13:53:23 +0000 Subject: [PATCH 3/6] chore: update executor version --- CHANGES.md | 2 +- app/views/install/compose.phtml | 2 +- docker-compose.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 75637ec6bc..cafaab4d53 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -3,7 +3,7 @@ ## What's Changed ## Security -- Bump executor to 0.5.8 [#8661](https://github.com/appwrite/appwrite/pull/8661) +- Bump executor to 0.5.9 [#8661](https://github.com/appwrite/appwrite/pull/8661) # Version 1.5.10 diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml index 251683067f..a307cfdc03 100644 --- a/app/views/install/compose.phtml +++ b/app/views/install/compose.phtml @@ -753,7 +753,7 @@ $image = $this->getParam('image', ''); <<: *x-logging restart: unless-stopped stop_signal: SIGINT - image: openruntimes/executor:0.5.8 + image: openruntimes/executor:0.5.9 networks: - appwrite - runtimes diff --git a/docker-compose.yml b/docker-compose.yml index feb1928da8..4fbdf39944 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -833,7 +833,7 @@ services: hostname: exc1 <<: *x-logging stop_signal: SIGINT - image: openruntimes/executor:0.5.8 + image: openruntimes/executor:0.5.9 restart: unless-stopped networks: - appwrite From 51e7bf6f0ad55a39964bd470aa1be7533ccbb05c Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Fri, 13 Sep 2024 14:10:15 +0000 Subject: [PATCH 4/6] chore: update executor version --- README-CN.md | 6 +++--- README.md | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README-CN.md b/README-CN.md index 5e0cbab4c4..f9221febfd 100644 --- a/README-CN.md +++ b/README-CN.md @@ -67,7 +67,7 @@ docker run -it --rm \ --volume /var/run/docker.sock:/var/run/docker.sock \ --volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \ --entrypoint="install" \ - appwrite/appwrite:1.5.10 + appwrite/appwrite:1.5.11 ``` ### Windows @@ -79,7 +79,7 @@ docker run -it --rm ^ --volume //var/run/docker.sock:/var/run/docker.sock ^ --volume "%cd%"/appwrite:/usr/src/code/appwrite:rw ^ --entrypoint="install" ^ - appwrite/appwrite:1.5.10 + appwrite/appwrite:1.5.11 ``` #### PowerShell @@ -89,7 +89,7 @@ docker run -it --rm ` --volume /var/run/docker.sock:/var/run/docker.sock ` --volume ${pwd}/appwrite:/usr/src/code/appwrite:rw ` --entrypoint="install" ` - appwrite/appwrite:1.5.10 + appwrite/appwrite:1.5.11 ``` 运行后,可以在浏览器上访问 http://localhost 找到 Appwrite 控制台。在非 Linux 的本机主机上完成安装后,服务器可能需要几分钟才能启动。 diff --git a/README.md b/README.md index 8305d78ef0..1e0f4426ef 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ docker run -it --rm \ --volume /var/run/docker.sock:/var/run/docker.sock \ --volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \ --entrypoint="install" \ - appwrite/appwrite:1.5.10 + appwrite/appwrite:1.5.11 ``` ### Windows @@ -87,7 +87,7 @@ docker run -it --rm ^ --volume //var/run/docker.sock:/var/run/docker.sock ^ --volume "%cd%"/appwrite:/usr/src/code/appwrite:rw ^ --entrypoint="install" ^ - appwrite/appwrite:1.5.10 + appwrite/appwrite:1.5.11 ``` #### PowerShell @@ -97,7 +97,7 @@ docker run -it --rm ` --volume /var/run/docker.sock:/var/run/docker.sock ` --volume ${pwd}/appwrite:/usr/src/code/appwrite:rw ` --entrypoint="install" ` - appwrite/appwrite:1.5.10 + appwrite/appwrite:1.5.11 ``` Once the Docker installation is complete, go to http://localhost to access the Appwrite console from your browser. Please note that on non-Linux native hosts, the server might take a few minutes to start after completing the installation. From 3a2d56e680803cd46082bb56eea707c58cb3ed69 Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Fri, 13 Sep 2024 14:36:58 +0000 Subject: [PATCH 5/6] chore: add OPR labels --- app/views/install/compose.phtml | 3 +++ docker-compose.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml index a307cfdc03..c082b9a40f 100644 --- a/app/views/install/compose.phtml +++ b/app/views/install/compose.phtml @@ -754,6 +754,8 @@ $image = $this->getParam('image', ''); restart: unless-stopped stop_signal: SIGINT image: openruntimes/executor:0.5.9 + labels: + openruntimes-image: 0.5.9 networks: - appwrite - runtimes @@ -771,6 +773,7 @@ $image = $this->getParam('image', ''); - OPR_EXECUTOR_DOCKER_HUB_USERNAME=$_APP_DOCKER_HUB_USERNAME - OPR_EXECUTOR_DOCKER_HUB_PASSWORD=$_APP_DOCKER_HUB_PASSWORD - OPR_EXECUTOR_ENV=$_APP_ENV + - OPR_EXECUTOR_IMAGE=0.5.9 - OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES - OPR_EXECUTOR_SECRET=$_APP_EXECUTOR_SECRET - OPR_EXECUTOR_LOGGING_PROVIDER=$_APP_LOGGING_PROVIDER diff --git a/docker-compose.yml b/docker-compose.yml index 4fbdf39944..503ec0e213 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -835,6 +835,8 @@ services: stop_signal: SIGINT image: openruntimes/executor:0.5.9 restart: unless-stopped + labels: + openruntimes-image: 0.5.9 networks: - appwrite - runtimes @@ -852,6 +854,7 @@ services: - OPR_EXECUTOR_DOCKER_HUB_USERNAME=$_APP_DOCKER_HUB_USERNAME - OPR_EXECUTOR_DOCKER_HUB_PASSWORD=$_APP_DOCKER_HUB_PASSWORD - OPR_EXECUTOR_ENV=$_APP_ENV + - OPR_EXECUTOR_IMAGE=0.5.9 - OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES - OPR_EXECUTOR_SECRET=$_APP_EXECUTOR_SECRET - OPR_EXECUTOR_RUNTIME_VERSIONS=v2,v3 From 342101c88cde99b70f11157b4617b02b3459659c Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Mon, 16 Sep 2024 19:53:11 +0000 Subject: [PATCH 6/6] chore: update executor version --- CHANGES.md | 2 +- app/views/install/compose.phtml | 5 +---- docker-compose.yml | 5 +---- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index cafaab4d53..cbf4105c95 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -3,7 +3,7 @@ ## What's Changed ## Security -- Bump executor to 0.5.9 [#8661](https://github.com/appwrite/appwrite/pull/8661) +- Bump executor to 0.5.10 [#8661](https://github.com/appwrite/appwrite/pull/8661) # Version 1.5.10 diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml index c082b9a40f..902aec9e8a 100644 --- a/app/views/install/compose.phtml +++ b/app/views/install/compose.phtml @@ -753,9 +753,7 @@ $image = $this->getParam('image', ''); <<: *x-logging restart: unless-stopped stop_signal: SIGINT - image: openruntimes/executor:0.5.9 - labels: - openruntimes-image: 0.5.9 + image: openruntimes/executor:0.5.10 networks: - appwrite - runtimes @@ -773,7 +771,6 @@ $image = $this->getParam('image', ''); - OPR_EXECUTOR_DOCKER_HUB_USERNAME=$_APP_DOCKER_HUB_USERNAME - OPR_EXECUTOR_DOCKER_HUB_PASSWORD=$_APP_DOCKER_HUB_PASSWORD - OPR_EXECUTOR_ENV=$_APP_ENV - - OPR_EXECUTOR_IMAGE=0.5.9 - OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES - OPR_EXECUTOR_SECRET=$_APP_EXECUTOR_SECRET - OPR_EXECUTOR_LOGGING_PROVIDER=$_APP_LOGGING_PROVIDER diff --git a/docker-compose.yml b/docker-compose.yml index 503ec0e213..2d40933d50 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -833,10 +833,8 @@ services: hostname: exc1 <<: *x-logging stop_signal: SIGINT - image: openruntimes/executor:0.5.9 + image: openruntimes/executor:0.5.10 restart: unless-stopped - labels: - openruntimes-image: 0.5.9 networks: - appwrite - runtimes @@ -854,7 +852,6 @@ services: - OPR_EXECUTOR_DOCKER_HUB_USERNAME=$_APP_DOCKER_HUB_USERNAME - OPR_EXECUTOR_DOCKER_HUB_PASSWORD=$_APP_DOCKER_HUB_PASSWORD - OPR_EXECUTOR_ENV=$_APP_ENV - - OPR_EXECUTOR_IMAGE=0.5.9 - OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES - OPR_EXECUTOR_SECRET=$_APP_EXECUTOR_SECRET - OPR_EXECUTOR_RUNTIME_VERSIONS=v2,v3