From 8580dad158c1848bd9430321589b03a2abd7668d Mon Sep 17 00:00:00 2001 From: Brandon Date: Thu, 3 Mar 2022 12:21:23 +0000 Subject: [PATCH 01/44] feat: add Gitpod configuration --- .gitpod.yml | 18 ++++++++++++++++++ docker-compose.yml | 1 + 2 files changed, 19 insertions(+) create mode 100644 .gitpod.yml diff --git a/.gitpod.yml b/.gitpod.yml new file mode 100644 index 0000000000..bb6f7df6a3 --- /dev/null +++ b/.gitpod.yml @@ -0,0 +1,18 @@ +tasks: + - init: docker-compose pull --include-deps mariadb redis appwrite/influxdb appwrite/telegraf appwrite/mailcatcher appwrite/requestcatcher + command: | + docker-compose up -d +ports: + - port: 8080 + onOpen: open-preview + visibility: public + - port: 443 + onOpen: ignore + visibility: public + - port: 3001 + onOpen: ignore + visibility: public + +vscode: + extensions: + - ms-azuretools.vscode-docker \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 8844c4fe58..af252e2f7f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,6 +22,7 @@ services: - --accesslog=true ports: - 80:80 + - 8080:80 - 443:443 - 9500:8080 volumes: From 2731739e3249bdfcb080d8380030a07d7112e559 Mon Sep 17 00:00:00 2001 From: Brandon Date: Thu, 3 Mar 2022 06:24:29 -0600 Subject: [PATCH 02/44] chore: temp disable appwrite images --- .gitpod.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index bb6f7df6a3..4e65eca553 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,5 +1,6 @@ tasks: - - init: docker-compose pull --include-deps mariadb redis appwrite/influxdb appwrite/telegraf appwrite/mailcatcher appwrite/requestcatcher + - init: docker-compose pull --include-deps mariadb redis +# appwrite/influxdb appwrite/telegraf appwrite/mailcatcher appwrite/requestcatcher command: | docker-compose up -d ports: @@ -15,4 +16,4 @@ ports: vscode: extensions: - - ms-azuretools.vscode-docker \ No newline at end of file + - ms-azuretools.vscode-docker From 5810e6aeb43226452daf3ffd28eb4cf078d7bbb7 Mon Sep 17 00:00:00 2001 From: Brandon Date: Thu, 3 Mar 2022 13:05:19 +0000 Subject: [PATCH 03/44] fix: pin image versions --- .gitpod.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index 4e65eca553..f57e7d6f29 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,6 +1,7 @@ tasks: - - init: docker-compose pull --include-deps mariadb redis -# appwrite/influxdb appwrite/telegraf appwrite/mailcatcher appwrite/requestcatcher + - init: docker-compose pull --include-deps mariadb:10.7 redis:6.2-alpine \ + appwrite/influxdb:1.4.0 appwrite/telegraf:1.3.0 appwrite/mailcatcher:1.0.0 \ + appwrite/requestcatcher:1.0.0 adminer command: | docker-compose up -d ports: From c04b52b8a7f0fead25b635d196f1028ff8e8525a Mon Sep 17 00:00:00 2001 From: Brandon Date: Thu, 3 Mar 2022 13:17:33 +0000 Subject: [PATCH 04/44] fix: pull images separately --- .gitpod.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index f57e7d6f29..9637efc9b4 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,9 +1,13 @@ tasks: - - init: docker-compose pull --include-deps mariadb:10.7 redis:6.2-alpine \ - appwrite/influxdb:1.4.0 appwrite/telegraf:1.3.0 appwrite/mailcatcher:1.0.0 \ - appwrite/requestcatcher:1.0.0 adminer + - init: docker pull mariadb:10.7 && \ + docker pull redis:6.2-alpine && \ + docker pull appwrite/influxdb:1.4.0 && \ + docker pull appwrite/telegraf:1.3.0 && \ + docker pull appwrite/mailcatcher:1.0.0 && \ + docker pull appwrite/requestcatcher:1.0.0 && + docker pull adminer command: | - docker-compose up -d + docker-compose up ports: - port: 8080 onOpen: open-preview From 83ee001fc7f91e57e281db2478af36da3d37c221 Mon Sep 17 00:00:00 2001 From: Brandon Date: Thu, 3 Mar 2022 13:25:06 +0000 Subject: [PATCH 05/44] chore: add trailing slash --- .gitpod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitpod.yml b/.gitpod.yml index 9637efc9b4..3264db10b5 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -4,7 +4,7 @@ tasks: docker pull appwrite/influxdb:1.4.0 && \ docker pull appwrite/telegraf:1.3.0 && \ docker pull appwrite/mailcatcher:1.0.0 && \ - docker pull appwrite/requestcatcher:1.0.0 && + docker pull appwrite/requestcatcher:1.0.0 && \ docker pull adminer command: | docker-compose up From b1c8d46ea17520e381d7d0cf5e8098572eac3e09 Mon Sep 17 00:00:00 2001 From: Brandon Date: Thu, 3 Mar 2022 13:35:28 +0000 Subject: [PATCH 06/44] chore: remove slashes --- .gitpod.yml | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index 3264db10b5..8bcf4feff8 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,13 +1,20 @@ tasks: - - init: docker pull mariadb:10.7 && \ - docker pull redis:6.2-alpine && \ - docker pull appwrite/influxdb:1.4.0 && \ - docker pull appwrite/telegraf:1.3.0 && \ - docker pull appwrite/mailcatcher:1.0.0 && \ - docker pull appwrite/requestcatcher:1.0.0 && \ + - init: docker pull mariadb:10.7 + docker pull redis:6.2-alpine + docker pull appwrite/influxdb:1.4.0 + docker pull appwrite/telegraf:1.3.0 + docker pull appwrite/mailcatcher:1.0.0 + docker pull appwrite/requestcatcher:1.0.0 docker pull adminer command: | docker-compose up + # - init: docker--compose pull --include-deps mariadb:10.7 && + # docker pull redis:6.2-alpine && \ + # docker pull appwrite/influxdb:1.4.0 && \ + # docker pull appwrite/telegraf:1.3.0 && \ + # docker pull appwrite/mailcatcher:1.0.0 && \ + # docker pull appwrite/requestcatcher:1.0.0 && \ + # docker pull adminer ports: - port: 8080 onOpen: open-preview From 5fac14fb42efc036a434139fe423198fe7da317d Mon Sep 17 00:00:00 2001 From: Brandon Date: Thu, 3 Mar 2022 13:37:09 +0000 Subject: [PATCH 07/44] chore: add back ampersands --- .gitpod.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index 8bcf4feff8..35cb6500f2 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,10 +1,10 @@ tasks: - - init: docker pull mariadb:10.7 - docker pull redis:6.2-alpine - docker pull appwrite/influxdb:1.4.0 - docker pull appwrite/telegraf:1.3.0 - docker pull appwrite/mailcatcher:1.0.0 - docker pull appwrite/requestcatcher:1.0.0 + - init: docker pull mariadb:10.7 && + docker pull redis:6.2-alpine && + docker pull appwrite/influxdb:1.4.0 && + docker pull appwrite/telegraf:1.3.0 && + docker pull appwrite/mailcatcher:1.0.0 && + docker pull appwrite/requestcatcher:1.0.0 && docker pull adminer command: | docker-compose up From 32773b2a0f839299b8ab2af5834971aee83081a9 Mon Sep 17 00:00:00 2001 From: Brandon Date: Thu, 3 Mar 2022 13:39:46 +0000 Subject: [PATCH 08/44] chore: cleanup --- .gitpod.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index 35cb6500f2..92254baa10 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -7,14 +7,7 @@ tasks: docker pull appwrite/requestcatcher:1.0.0 && docker pull adminer command: | - docker-compose up - # - init: docker--compose pull --include-deps mariadb:10.7 && - # docker pull redis:6.2-alpine && \ - # docker pull appwrite/influxdb:1.4.0 && \ - # docker pull appwrite/telegraf:1.3.0 && \ - # docker pull appwrite/mailcatcher:1.0.0 && \ - # docker pull appwrite/requestcatcher:1.0.0 && \ - # docker pull adminer + docker-compose up -d ports: - port: 8080 onOpen: open-preview From cab891a4b985c81ebe5348c9bd7df758b3e306b5 Mon Sep 17 00:00:00 2001 From: Brandon Date: Thu, 3 Mar 2022 14:08:26 +0000 Subject: [PATCH 09/44] chore: add more images to prebuild --- .gitpod.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index 92254baa10..8a51893ef5 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -5,12 +5,15 @@ tasks: docker pull appwrite/telegraf:1.3.0 && docker pull appwrite/mailcatcher:1.0.0 && docker pull appwrite/requestcatcher:1.0.0 && - docker pull adminer + docker pull adminer && + docker pull composer:2.0 && + docker pull node:16.13.2-alpine3.15 && + docker pull php:8.0.14-cli-alpine3.15 command: | docker-compose up -d ports: - port: 8080 - onOpen: open-preview + onOpen: ignore visibility: public - port: 443 onOpen: ignore From f2316a0c7e2b0ac12c7921210cf7a5d4a55ea0de Mon Sep 17 00:00:00 2001 From: Brandon Date: Thu, 3 Mar 2022 14:30:55 +0000 Subject: [PATCH 10/44] chore: add command to build images --- .gitpod.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitpod.yml b/.gitpod.yml index 8a51893ef5..3d5d528cf7 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -8,7 +8,8 @@ tasks: docker pull adminer && docker pull composer:2.0 && docker pull node:16.13.2-alpine3.15 && - docker pull php:8.0.14-cli-alpine3.15 + docker pull php:8.0.14-cli-alpine3.15 && + docker-compose build command: | docker-compose up -d ports: From 51c231a2bd4725c4256746c99424037b061da180 Mon Sep 17 00:00:00 2001 From: Brandon Date: Thu, 3 Mar 2022 08:53:42 -0600 Subject: [PATCH 11/44] chore: simplify command to pull images --- .gitpod.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index 3d5d528cf7..1d5eacd25f 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,14 +1,5 @@ tasks: - - init: docker pull mariadb:10.7 && - docker pull redis:6.2-alpine && - docker pull appwrite/influxdb:1.4.0 && - docker pull appwrite/telegraf:1.3.0 && - docker pull appwrite/mailcatcher:1.0.0 && - docker pull appwrite/requestcatcher:1.0.0 && - docker pull adminer && - docker pull composer:2.0 && - docker pull node:16.13.2-alpine3.15 && - docker pull php:8.0.14-cli-alpine3.15 && + - init: docker-compose pull docker-compose build command: | docker-compose up -d From fdc0247cf7b8a80277a60eb3a627124d17ada8e4 Mon Sep 17 00:00:00 2001 From: Brandon Date: Thu, 3 Mar 2022 08:57:13 -0600 Subject: [PATCH 12/44] chore: fix command --- .gitpod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitpod.yml b/.gitpod.yml index 1d5eacd25f..d2e0494965 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,5 +1,5 @@ tasks: - - init: docker-compose pull + - init: docker-compose pull && docker-compose build command: | docker-compose up -d From e35ccea43aafcfe0e1b78aebc58ecd5e1f4d93d3 Mon Sep 17 00:00:00 2001 From: Steven Nguyen Date: Sat, 5 Mar 2022 15:35:44 -0800 Subject: [PATCH 13/44] Fix platform type mismatch in origin validation --- app/controllers/api/projects.php | 3 ++- src/Appwrite/Network/Validator/Origin.php | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/controllers/api/projects.php b/app/controllers/api/projects.php index ed2de69ae4..2bee190628 100644 --- a/app/controllers/api/projects.php +++ b/app/controllers/api/projects.php @@ -4,6 +4,7 @@ use Appwrite\Auth\Auth; use Appwrite\Auth\Validator\Password; use Appwrite\Network\Validator\CNAME; use Appwrite\Network\Validator\Domain as DomainValidator; +use Appwrite\Network\Validator\Origin; use Appwrite\Network\Validator\URL; use Appwrite\Utopia\Database\Validator\CustomId; use Appwrite\Utopia\Response; @@ -1002,7 +1003,7 @@ App::post('/v1/projects/:projectId/platforms') ->label('sdk.response.type', Response::CONTENT_TYPE_JSON) ->label('sdk.response.model', Response::MODEL_PLATFORM) ->param('projectId', null, new UID(), 'Project unique ID.') - ->param('type', null, new WhiteList(['web', 'flutter-ios', 'flutter-android', 'flutter-linux', 'flutter-macos', 'flutter-windows', 'apple-ios', 'apple-macos', 'apple-watchos', 'apple-tvos', 'android', 'unity'], true), 'Platform type.') + ->param('type', null, new WhiteList([Origin::CLIENT_TYPE_WEB, Origin::CLIENT_TYPE_FLUTTER_IOS, Origin::CLIENT_TYPE_FLUTTER_ANDROID, Origin::CLIENT_TYPE_FLUTTER_LINUX, Origin::CLIENT_TYPE_FLUTTER_MACOS, Origin::CLIENT_TYPE_FLUTTER_WINDOWS, Origin::CLIENT_TYPE_APPLE_IOS, Origin::CLIENT_TYPE_APPLE_MACOS, Origin::CLIENT_TYPE_APPLE_WATCHOS, Origin::CLIENT_TYPE_APPLE_TVOS, Origin::CLIENT_TYPE_ANDROID, Origin::CLIENT_TYPE_UNITY], true), 'Platform type.') ->param('name', null, new Text(128), 'Platform name. Max length: 128 chars.') ->param('key', '', new Text(256), 'Package name for Android or bundle ID for iOS or macOS. Max length: 256 chars.', true) ->param('store', '', new Text(256), 'App store or Google Play store ID. Max length: 256 chars.', true) diff --git a/src/Appwrite/Network/Validator/Origin.php b/src/Appwrite/Network/Validator/Origin.php index 385f9e2dc0..8831707cef 100644 --- a/src/Appwrite/Network/Validator/Origin.php +++ b/src/Appwrite/Network/Validator/Origin.php @@ -13,8 +13,12 @@ class Origin extends Validator public const CLIENT_TYPE_FLUTTER_MACOS = 'flutter-macos'; public const CLIENT_TYPE_FLUTTER_WINDOWS = 'flutter-windows'; public const CLIENT_TYPE_FLUTTER_LINUX = 'flutter-linux'; + public const CLIENT_TYPE_APPLE_IOS = 'apple-ios'; + public const CLIENT_TYPE_APPLE_MACOS = 'apple-macos'; + public const CLIENT_TYPE_APPLE_WATCHOS = 'apple-watchos'; + public const CLIENT_TYPE_APPLE_TVOS = 'apple-tvos'; public const CLIENT_TYPE_ANDROID = 'android'; - public const CLIENT_TYPE_IOS = 'ios'; + public const CLIENT_TYPE_UNITY = 'unity'; public const SCHEME_TYPE_HTTP = 'http'; @@ -73,7 +77,7 @@ class Origin extends Validator case self::CLIENT_TYPE_FLUTTER_WINDOWS: case self::CLIENT_TYPE_FLUTTER_LINUX: case self::CLIENT_TYPE_ANDROID: - case self::CLIENT_TYPE_IOS: + case self::CLIENT_TYPE_APPLE_IOS: $this->clients[] = (isset($platform['key'])) ? $platform['key'] : ''; break; From 5e8d2c1ee7cd6bfe50574e4a78268b0796fee489 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 7 Mar 2022 11:03:10 +0100 Subject: [PATCH 14/44] chore: add 0.13.x to issue template --- .github/ISSUE_TEMPLATE/bug.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/ISSUE_TEMPLATE/bug.yaml b/.github/ISSUE_TEMPLATE/bug.yaml index 62272064f8..d30f05bfd4 100644 --- a/.github/ISSUE_TEMPLATE/bug.yaml +++ b/.github/ISSUE_TEMPLATE/bug.yaml @@ -37,6 +37,7 @@ body: label: "🎲 Appwrite version" description: "What version of Appwrite are you running?" options: + - Version 0.13.x - Version 0.12.x - Version 0.11.x - Version 0.10.x From 13ac77e78ccee9966eac655084486f8b5d1be376 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Ba=C4=8Do?= Date: Mon, 7 Mar 2022 11:31:41 +0000 Subject: [PATCH 15/44] Updated environment secrets --- app/views/install/compose.phtml | 1 + docker-compose.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml index 06feff2160..180d2248d3 100644 --- a/app/views/install/compose.phtml +++ b/app/views/install/compose.phtml @@ -344,6 +344,7 @@ services: - _APP_STORAGE_DO_SPACES_BUCKET - _APP_LOGGING_PROVIDER - _APP_LOGGING_CONFIG + - _APP_EXECUTOR_SECRET appwrite-worker-certificates: image: /: diff --git a/docker-compose.yml b/docker-compose.yml index 8844c4fe58..c12ae93889 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -280,6 +280,7 @@ services: - _APP_STORAGE_DO_SPACES_BUCKET - _APP_LOGGING_PROVIDER - _APP_LOGGING_CONFIG + - _APP_EXECUTOR_SECRET appwrite-worker-database: entrypoint: worker-database From f07cd7b0432b5d471520a2ae5063631bed389dca Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 7 Mar 2022 12:33:09 +0100 Subject: [PATCH 16/44] chore: prepare 0.13.2 --- CHANGES.md | 6 +++- README-CN.md | 6 ++-- README.md | 6 ++-- app/init.php | 4 +-- composer.lock | 52 ++++++++++++++-------------- src/Appwrite/Migration/Migration.php | 1 + 6 files changed, 40 insertions(+), 35 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index de20ec46bf..9b8cd472ae 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,8 @@ -# Version 0.13.1 (NOT RELEASED) +# Version 0.13.2 +## Bugs +- Fixed global issue for wirte permissions + +# Version 0.13.1 ## Bugs - Fixed the Console UI redirect breaking the header and navigation - Fixed timeout in Functions API to respect the environment variable `_APP_FUNCTIONS_TIMEOUT` diff --git a/README-CN.md b/README-CN.md index ec5d0489b0..eefa1530ee 100644 --- a/README-CN.md +++ b/README-CN.md @@ -59,7 +59,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:0.13.1 + appwrite/appwrite:0.13.2 ``` ### Windows @@ -71,7 +71,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:0.13.1 + appwrite/appwrite:0.13.2 ``` #### PowerShell @@ -81,7 +81,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:0.13.1 + appwrite/appwrite:0.13.2 ``` 运行后，可以在浏览器上访问 http://localhost 找到 Appwrite 控制台。在非 Linux 的本机主机上完成安装后，服务器可能需要几分钟才能启动。 diff --git a/README.md b/README.md index c879aa3b94..326a2cda2c 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,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:0.13.1 + appwrite/appwrite:0.13.2 ``` ### Windows @@ -74,7 +74,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:0.13.1 + appwrite/appwrite:0.13.2 ``` #### PowerShell @@ -84,7 +84,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:0.13.1 + appwrite/appwrite:0.13.2 ``` Once the Docker installation completes, 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 installation completes. diff --git a/app/init.php b/app/init.php index d1569562f6..0bcb8d38a8 100644 --- a/app/init.php +++ b/app/init.php @@ -70,8 +70,8 @@ const APP_LIMIT_ANTIVIRUS = 20000000; //20MB const APP_LIMIT_ENCRYPTION = 20000000; //20MB const APP_LIMIT_COMPRESSION = 20000000; //20MB const APP_LIMIT_PREVIEW = 10000000; //10MB file size limit for preview endpoint -const APP_CACHE_BUSTER = 301; -const APP_VERSION_STABLE = '0.13.1'; +const APP_CACHE_BUSTER = 302; +const APP_VERSION_STABLE = '0.13.2'; const APP_DATABASE_ATTRIBUTE_EMAIL = 'email'; const APP_DATABASE_ATTRIBUTE_ENUM = 'enum'; const APP_DATABASE_ATTRIBUTE_IP = 'ip'; diff --git a/composer.lock b/composer.lock index b5e657b973..57f4204029 100644 --- a/composer.lock +++ b/composer.lock @@ -1646,7 +1646,7 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.24.0", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", @@ -1708,7 +1708,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.24.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0" }, "funding": [ { @@ -1728,16 +1728,16 @@ }, { "name": "symfony/polyfill-php80", - "version": "v1.24.0", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9" + "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9", - "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4407588e0d3f1f52efb65fbe92babe41f37fe50c", + "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c", "shasum": "" }, "require": { @@ -1791,7 +1791,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.24.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.25.0" }, "funding": [ { @@ -1807,7 +1807,7 @@ "type": "tidelift" } ], - "time": "2021-09-13T13:58:33+00:00" + "time": "2022-03-04T08:16:47+00:00" }, { "name": "utopia-php/abuse", @@ -3677,16 +3677,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.10.3", + "version": "1.11.0", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "c6a951b75d684fd43fbbd69617488e1e2e8924ba" + "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/c6a951b75d684fd43fbbd69617488e1e2e8924ba", - "reference": "c6a951b75d684fd43fbbd69617488e1e2e8924ba", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614", + "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614", "shasum": "" }, "require": { @@ -3724,7 +3724,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.10.3" + "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0" }, "funding": [ { @@ -3732,7 +3732,7 @@ "type": "tidelift" } ], - "time": "2022-03-02T14:16:47+00:00" + "time": "2022-03-03T13:19:32+00:00" }, { "name": "netresearch/jsonmapper", @@ -4234,16 +4234,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.14", + "version": "9.2.15", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "9f4d60b6afe5546421462b76cd4e633ebc364ab4" + "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9f4d60b6afe5546421462b76cd4e633ebc364ab4", - "reference": "9f4d60b6afe5546421462b76cd4e633ebc364ab4", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2e9da11878c4202f97915c1cb4bb1ca318a63f5f", + "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f", "shasum": "" }, "require": { @@ -4299,7 +4299,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.14" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.15" }, "funding": [ { @@ -4307,7 +4307,7 @@ "type": "github" } ], - "time": "2022-02-28T12:38:02+00:00" + "time": "2022-03-07T09:28:20+00:00" }, { "name": "phpunit/php-file-iterator", @@ -5809,7 +5809,7 @@ }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.24.0", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", @@ -5870,7 +5870,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.24.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.25.0" }, "funding": [ { @@ -5890,7 +5890,7 @@ }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.24.0", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", @@ -5954,7 +5954,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.24.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.25.0" }, "funding": [ { @@ -5974,7 +5974,7 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.24.0", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", @@ -6037,7 +6037,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.24.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.25.0" }, "funding": [ { diff --git a/src/Appwrite/Migration/Migration.php b/src/Appwrite/Migration/Migration.php index 700b09d9b6..ce4e0ad810 100644 --- a/src/Appwrite/Migration/Migration.php +++ b/src/Appwrite/Migration/Migration.php @@ -37,6 +37,7 @@ abstract class Migration public static array $versions = [ '0.13.0' => 'V12', '0.13.1' => 'V12', + '0.13.2' => 'V12', ]; /** From 9a22acf68806c716f799b08c46e2a2824d99be42 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 7 Mar 2022 12:36:04 +0100 Subject: [PATCH 17/44] chore: update changelog --- CHANGES.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 9b8cd472ae..9b9e23fb37 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,7 @@ # Version 0.13.2 ## Bugs -- Fixed global issue for wirte permissions +- Fixed global issue for write permissions +- Fixed missing `_APP_EXECUTOR_SECRET` environment variable for deletes worker # Version 0.13.1 ## Bugs From a4dbc78fe1e1a437b592f2c716d24420afad4667 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 7 Mar 2022 12:39:29 +0100 Subject: [PATCH 18/44] chore: update changelog --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 9b9e23fb37..da3d68d10f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,6 +2,7 @@ ## Bugs - Fixed global issue for write permissions - Fixed missing `_APP_EXECUTOR_SECRET` environment variable for deletes worker +- Fixed iOS platforms for origin validation by @stnguyen90 in https://github.com/appwrite/appwrite/pull/2907 # Version 0.13.1 ## Bugs From 9ea2bcbfc0b41f88927a7e2f6e7ba980a864f3dd Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 7 Mar 2022 13:00:38 +0100 Subject: [PATCH 19/44] chore: upgrade composer lock --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 57f4204029..94f1e01905 100644 --- a/composer.lock +++ b/composer.lock @@ -2129,16 +2129,16 @@ }, { "name": "utopia-php/database", - "version": "0.15.2", + "version": "0.15.3", "source": { "type": "git", "url": "https://github.com/utopia-php/database.git", - "reference": "4ae9f1162d6640ccfe28afa0bbc60b907a7ad1c0" + "reference": "726e3b04fb1f1b3b654bc1d3114deaf1481cb008" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/database/zipball/4ae9f1162d6640ccfe28afa0bbc60b907a7ad1c0", - "reference": "4ae9f1162d6640ccfe28afa0bbc60b907a7ad1c0", + "url": "https://api.github.com/repos/utopia-php/database/zipball/726e3b04fb1f1b3b654bc1d3114deaf1481cb008", + "reference": "726e3b04fb1f1b3b654bc1d3114deaf1481cb008", "shasum": "" }, "require": { @@ -2186,9 +2186,9 @@ ], "support": { "issues": "https://github.com/utopia-php/database/issues", - "source": "https://github.com/utopia-php/database/tree/0.15.2" + "source": "https://github.com/utopia-php/database/tree/0.15.3" }, - "time": "2022-02-28T15:53:37+00:00" + "time": "2022-03-07T11:59:51+00:00" }, { "name": "utopia-php/domains", From 048997dd4177f803e08ee27b6251ba8ec49f5500 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Ba=C4=8Do?= Date: Mon, 7 Mar 2022 13:03:51 +0000 Subject: [PATCH 20/44] Imcreased execution substring limit --- app/executor.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/executor.php b/app/executor.php index b82d17a117..1fa32599ab 100644 --- a/app/executor.php +++ b/app/executor.php @@ -500,8 +500,8 @@ App::post('/v1/execution') $execution = [ 'status' => $functionStatus, 'statusCode' => $statusCode, - 'stdout' => \utf8_encode(\mb_substr($stdout, -8000)), - 'stderr' => \utf8_encode(\mb_substr($stderr, -8000)), + 'stdout' => \utf8_encode(\mb_substr($stdout, -16384)), + 'stderr' => \utf8_encode(\mb_substr($stderr, -16384)), 'time' => $executionTime, ]; From c3c70bb0053c253282379d76aac5eec0d7f4f9e7 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 7 Mar 2022 16:08:48 +0100 Subject: [PATCH 21/44] chore update changelog --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index da3d68d10f..1a81a3bbb1 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,6 +2,7 @@ ## Bugs - Fixed global issue for write permissions - Fixed missing `_APP_EXECUTOR_SECRET` environment variable for deletes worker +- Increase execution `stdout` and `stderr` from 8000 to 16384 character limit - Fixed iOS platforms for origin validation by @stnguyen90 in https://github.com/appwrite/appwrite/pull/2907 # Version 0.13.1 From f1a9f6acd978897e352db878b8ad3f40563c6fc9 Mon Sep 17 00:00:00 2001 From: Brandon Date: Mon, 7 Mar 2022 08:38:10 -0600 Subject: [PATCH 22/44] feat: add composer init to prebuild --- .gitpod.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitpod.yml b/.gitpod.yml index d2e0494965..14eb199c1f 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -2,7 +2,12 @@ tasks: - init: docker-compose pull && docker-compose build command: | - docker-compose up -d + docker-compose up -d + - init: docker-compose pull &&docker run --rm --interactive --tty \ + --volume $PWD:/app \ + composer update --ignore-platform-reqs \ + --optimize-autoloader --no-plugins --no-scripts --prefer-dist + ports: - port: 8080 onOpen: ignore From 0b5a75f063390561d24a22e6e3eda35a7fc337dc Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 7 Mar 2022 16:17:28 +0100 Subject: [PATCH 23/44] chore: update changelog --- CHANGES.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 1a81a3bbb1..70f06da929 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,8 +1,8 @@ # Version 0.13.2 ## Bugs - Fixed global issue for write permissions -- Fixed missing `_APP_EXECUTOR_SECRET` environment variable for deletes worker -- Increase execution `stdout` and `stderr` from 8000 to 16384 character limit +- Added missing `_APP_EXECUTOR_SECRET` environment variable for deletes worker +- Increased execution `stdout` and `stderr` from 8000 to 16384 character limit - Fixed iOS platforms for origin validation by @stnguyen90 in https://github.com/appwrite/appwrite/pull/2907 # Version 0.13.1 From 692e72a8bdc11b13ad3875e945a66dcfb9e86f02 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 7 Mar 2022 16:21:39 +0100 Subject: [PATCH 24/44] chore: update changelog --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 70f06da929..2da2a7095d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,6 @@ # Version 0.13.2 ## Bugs -- Fixed global issue for write permissions +- Fixed global issue with write permissions - Added missing `_APP_EXECUTOR_SECRET` environment variable for deletes worker - Increased execution `stdout` and `stderr` from 8000 to 16384 character limit - Fixed iOS platforms for origin validation by @stnguyen90 in https://github.com/appwrite/appwrite/pull/2907 From 9434f126b9b0ff6bbc62be18af4bc774e4de915a Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 7 Mar 2022 16:59:31 +0100 Subject: [PATCH 25/44] feat: increase preview maximum file size --- app/init.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/init.php b/app/init.php index 0bcb8d38a8..40c2f569b9 100644 --- a/app/init.php +++ b/app/init.php @@ -69,7 +69,7 @@ const APP_LIMIT_USERS = 10000; const APP_LIMIT_ANTIVIRUS = 20000000; //20MB const APP_LIMIT_ENCRYPTION = 20000000; //20MB const APP_LIMIT_COMPRESSION = 20000000; //20MB -const APP_LIMIT_PREVIEW = 10000000; //10MB file size limit for preview endpoint +const APP_LIMIT_PREVIEW = 20000000; //20MB file size limit for preview endpoint const APP_CACHE_BUSTER = 302; const APP_VERSION_STABLE = '0.13.2'; const APP_DATABASE_ATTRIBUTE_EMAIL = 'email'; From b3b6470d9dbd8e87c15a433641594640f8caf369 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 7 Mar 2022 16:59:42 +0100 Subject: [PATCH 26/44] chore: update readme --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 2da2a7095d..7a9ccd6275 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -3,6 +3,7 @@ - Fixed global issue with write permissions - Added missing `_APP_EXECUTOR_SECRET` environment variable for deletes worker - Increased execution `stdout` and `stderr` from 8000 to 16384 character limit +- Increased maximum file size for image preview to 20mb - Fixed iOS platforms for origin validation by @stnguyen90 in https://github.com/appwrite/appwrite/pull/2907 # Version 0.13.1 @@ -12,7 +13,6 @@ - Fixed team invite to be invalid after successful use by @Malte2036 in https://github.com/appwrite/appwrite/issues/2593 # Version 0.13.0 - ## Features ### Functions - Synchronous function execution From c16de61d7ee9ed29d4e2b99fd3ad455de580def7 Mon Sep 17 00:00:00 2001 From: Brandon Date: Mon, 7 Mar 2022 10:13:15 -0600 Subject: [PATCH 27/44] chore: move composer to single line --- .gitpod.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index 14eb199c1f..79d3df0567 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,12 +1,9 @@ tasks: - init: docker-compose pull && - docker-compose build + docker-compose build && + docker run --rm --interactive --tty --volume $PWD:/app composer update --ignore-platform-reqs --optimize-autoloader --no-plugins --no-scripts --prefer-dist command: | - docker-compose up -d - - init: docker-compose pull &&docker run --rm --interactive --tty \ - --volume $PWD:/app \ - composer update --ignore-platform-reqs \ - --optimize-autoloader --no-plugins --no-scripts --prefer-dist + docker-compose up -d ports: - port: 8080 From b16257c9f1d9775d2df4b55d89fbcd4724aaa470 Mon Sep 17 00:00:00 2001 From: Brandon Date: Tue, 8 Mar 2022 06:17:07 -0600 Subject: [PATCH 28/44] chore: remove additional ports from Gitpod config --- .gitpod.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index 79d3df0567..58770253a1 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -9,12 +9,6 @@ ports: - port: 8080 onOpen: ignore visibility: public - - port: 443 - onOpen: ignore - visibility: public - - port: 3001 - onOpen: ignore - visibility: public vscode: extensions: From 8fee065ef05e14ec116d23c674af45540a04de56 Mon Sep 17 00:00:00 2001 From: Brandon Date: Tue, 8 Mar 2022 07:39:29 -0600 Subject: [PATCH 29/44] feat: add custom Gitpod Dockerfile with PHP 8 and Deno support --- .gitpod.Dockerfile | 6 ++++++ .gitpod.yml | 3 +++ 2 files changed, 9 insertions(+) create mode 100644 .gitpod.Dockerfile diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile new file mode 100644 index 0000000000..0a4f1ebab0 --- /dev/null +++ b/.gitpod.Dockerfile @@ -0,0 +1,6 @@ +FROM gitpod/workspace-full + +RUN curl -fsSL https://deno.land/x/install/install.sh | sh +RUN /home/gitpod/.deno/bin/deno completions bash > /home/gitpod/.bashrc.d/90-deno && echo 'export DENO_INSTALL="/home/gitpod/.deno"' >> /home/gitpod/.bashrc.d/90-deno && echo 'export PATH="$DENO_INSTALL/bin:$PATH"' >> /home/gitpod/.bashrc.d/90-deno + +RUN sudo apt-get install php8.0 diff --git a/.gitpod.yml b/.gitpod.yml index 58770253a1..811ee54ec8 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,3 +1,6 @@ +image: + file: .gitpod.Dockerfile + tasks: - init: docker-compose pull && docker-compose build && From 61ad0fbfdd2e3dc2a97bc91333eccddde3b5eb32 Mon Sep 17 00:00:00 2001 From: Brandon Date: Tue, 8 Mar 2022 08:06:02 -0600 Subject: [PATCH 30/44] fix: add PHP8 repoistory and upgrade --- .gitpod.Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 0a4f1ebab0..e6fd6b45c6 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -3,4 +3,6 @@ FROM gitpod/workspace-full RUN curl -fsSL https://deno.land/x/install/install.sh | sh RUN /home/gitpod/.deno/bin/deno completions bash > /home/gitpod/.bashrc.d/90-deno && echo 'export DENO_INSTALL="/home/gitpod/.deno"' >> /home/gitpod/.bashrc.d/90-deno && echo 'export PATH="$DENO_INSTALL/bin:$PATH"' >> /home/gitpod/.bashrc.d/90-deno -RUN sudo apt-get install php8.0 +RUN sudo apt install software-properties-common && sudo add-apt-repository ppa:ondrej/php -y +RUN sudo apt update +RUN sudo apt upgrade -y From 1f86a43ebeb3eec26dc718f4e2e49e0e77efb85e Mon Sep 17 00:00:00 2001 From: Brandon Date: Tue, 8 Mar 2022 08:27:42 -0600 Subject: [PATCH 31/44] chore: add more flags to use defaults --- .gitpod.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index e6fd6b45c6..8f40a3b4d5 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -5,4 +5,4 @@ RUN /home/gitpod/.deno/bin/deno completions bash > /home/gitpod/.bashrc.d/90-den RUN sudo apt install software-properties-common && sudo add-apt-repository ppa:ondrej/php -y RUN sudo apt update -RUN sudo apt upgrade -y +RUN sudo apt upgrade -q -y --force-yes From 29be327db7c0632166176f75c7d08ea151bca4d6 Mon Sep 17 00:00:00 2001 From: Brandon Date: Tue, 8 Mar 2022 09:12:57 -0600 Subject: [PATCH 32/44] chore: update install command for PHP8.0 --- .gitpod.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 8f40a3b4d5..291d8d9217 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -5,4 +5,4 @@ RUN /home/gitpod/.deno/bin/deno completions bash > /home/gitpod/.bashrc.d/90-den RUN sudo apt install software-properties-common && sudo add-apt-repository ppa:ondrej/php -y RUN sudo apt update -RUN sudo apt upgrade -q -y --force-yes +RUN sudo DEBIAN_FRONTEND=noninteractive apt-get -y install php8.0 From 23cacb0eb8a1974c9d7976c469a9dd7cb9f09329 Mon Sep 17 00:00:00 2001 From: Brandon Date: Tue, 8 Mar 2022 09:55:52 -0600 Subject: [PATCH 33/44] fix: skip apache2 prompts --- .gitpod.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 291d8d9217..bdb1a0dd21 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -5,4 +5,4 @@ RUN /home/gitpod/.deno/bin/deno completions bash > /home/gitpod/.bashrc.d/90-den RUN sudo apt install software-properties-common && sudo add-apt-repository ppa:ondrej/php -y RUN sudo apt update -RUN sudo DEBIAN_FRONTEND=noninteractive apt-get -y install php8.0 +RUN sudo apt --yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" install php8.0 From 1663653b0bda6eb5336c0ccc9e183590f98f3e2c Mon Sep 17 00:00:00 2001 From: Brandon Date: Tue, 8 Mar 2022 10:33:08 -0600 Subject: [PATCH 34/44] fix: PHP8 install workarounds --- .gitpod.Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index bdb1a0dd21..7fe33beaf9 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -3,6 +3,9 @@ FROM gitpod/workspace-full RUN curl -fsSL https://deno.land/x/install/install.sh | sh RUN /home/gitpod/.deno/bin/deno completions bash > /home/gitpod/.bashrc.d/90-deno && echo 'export DENO_INSTALL="/home/gitpod/.deno"' >> /home/gitpod/.bashrc.d/90-deno && echo 'export PATH="$DENO_INSTALL/bin:$PATH"' >> /home/gitpod/.bashrc.d/90-deno -RUN sudo apt install software-properties-common && sudo add-apt-repository ppa:ondrej/php -y +RUN sudo a2dismod php7.4 +RUN sudo a2dismod mpm_prefork +RUN sudo apt --yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install apache2 +RUN sudo apt --yes install software-properties-common && sudo add-apt-repository ppa:ondrej/php -y RUN sudo apt update -RUN sudo apt --yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" install php8.0 +RUN sudo apt --yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install php8.0 From 8a90c3317228afb9b03afbe7ac70f1a69cea01bf Mon Sep 17 00:00:00 2001 From: Brandon Date: Tue, 8 Mar 2022 10:39:15 -0600 Subject: [PATCH 35/44] chore: add comments for install and workarounds --- .gitpod.Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 7fe33beaf9..0b7d87b92f 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -1,11 +1,17 @@ FROM gitpod/workspace-full +# Install and configure Deno RUN curl -fsSL https://deno.land/x/install/install.sh | sh RUN /home/gitpod/.deno/bin/deno completions bash > /home/gitpod/.bashrc.d/90-deno && echo 'export DENO_INSTALL="/home/gitpod/.deno"' >> /home/gitpod/.bashrc.d/90-deno && echo 'export PATH="$DENO_INSTALL/bin:$PATH"' >> /home/gitpod/.bashrc.d/90-deno +# Disable current PHP installation RUN sudo a2dismod php7.4 RUN sudo a2dismod mpm_prefork + +# Install apache2 (PHP install requires to do this first) RUN sudo apt --yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install apache2 + +# Update to PHP 8.0 with unattended installation RUN sudo apt --yes install software-properties-common && sudo add-apt-repository ppa:ondrej/php -y RUN sudo apt update RUN sudo apt --yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install php8.0 From c7500b4b096da24ca8e3ffe289290cc36e134d59 Mon Sep 17 00:00:00 2001 From: Brandon Date: Tue, 8 Mar 2022 10:44:14 -0600 Subject: [PATCH 36/44] chore: remove Deno install --- .gitpod.Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 0b7d87b92f..6634613b7e 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -1,9 +1,5 @@ FROM gitpod/workspace-full -# Install and configure Deno -RUN curl -fsSL https://deno.land/x/install/install.sh | sh -RUN /home/gitpod/.deno/bin/deno completions bash > /home/gitpod/.bashrc.d/90-deno && echo 'export DENO_INSTALL="/home/gitpod/.deno"' >> /home/gitpod/.bashrc.d/90-deno && echo 'export PATH="$DENO_INSTALL/bin:$PATH"' >> /home/gitpod/.bashrc.d/90-deno - # Disable current PHP installation RUN sudo a2dismod php7.4 RUN sudo a2dismod mpm_prefork From fa5cba5ac3e84be2b074e0c0427bb10a662da800 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Wed, 9 Mar 2022 22:13:36 +0100 Subject: [PATCH 37/44] fix: ui float input field --- app/views/console/database/document.phtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/console/database/document.phtml b/app/views/console/database/document.phtml index 8c8de7429b..faa198aa4b 100644 --- a/app/views/console/database/document.phtml +++ b/app/views/console/database/document.phtml @@ -110,7 +110,7 @@ $logs = $this->getParam('logs', null);