diff --git a/.env b/.env index 30bacb2a8..581af6d97 100644 --- a/.env +++ b/.env @@ -16,7 +16,7 @@ _APP_DB_PORT=3306 _APP_DB_SCHEMA=appwrite _APP_DB_USER=user _APP_DB_PASS=password -_APP_STORAGE_ANTIVIRUS=disabled +_APP_STORAGE_ANTIVIRUS=enabled _APP_STORAGE_ANTIVIRUS_HOST=clamav _APP_STORAGE_ANTIVIRUS_PORT=3310 _APP_INFLUXDB_HOST=influxdb diff --git a/CHANGES.md b/CHANGES.md index 2ae482c9e..99e480f78 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -12,8 +12,8 @@ ## Upgrades -- Upgraded ClamAV to version 1.3.0 - Upgraded utopia-php/abuse to version 0.4.0 +- Upgraded utopia-php/analytics to version 0.2.0 ## Bugs diff --git a/README.md b/README.md index 3d4bd7573..ede2f0c4e 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,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.7.1 + appwrite/appwrite:0.7.2 ``` ### Windows @@ -65,7 +65,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.7.1 + appwrite/appwrite:0.7.2 ``` #### PowerShell @@ -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:0.7.1 + appwrite/appwrite:0.7.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/controllers/general.php b/app/controllers/general.php index fe0016038..18e1ab1bb 100644 --- a/app/controllers/general.php +++ b/app/controllers/general.php @@ -256,6 +256,8 @@ App::error(function ($error, $utopia, $request, $response, $layout, $project) { $template = ($route) ? $route->getLabel('error', null) : null; if (php_sapi_name() === 'cli') { + Console::error('[Error] Timestamp: '.date('c', time())); + if($route) { Console::error('[Error] Method: '.$route->getMethod()); Console::error('[Error] URL: '.$route->getURL()); diff --git a/app/init.php b/app/init.php index 86f172ed4..2aa5fb020 100644 --- a/app/init.php +++ b/app/init.php @@ -40,7 +40,7 @@ const APP_MODE_DEFAULT = 'default'; const APP_MODE_ADMIN = 'admin'; const APP_PAGING_LIMIT = 12; const APP_CACHE_BUSTER = 145; -const APP_VERSION_STABLE = '0.7.1'; +const APP_VERSION_STABLE = '0.7.2'; const APP_STORAGE_UPLOADS = '/storage/uploads'; const APP_STORAGE_FUNCTIONS = '/storage/functions'; const APP_STORAGE_CACHE = '/storage/cache'; diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml index fdbfff2c5..1c0c98108 100644 --- a/app/views/install/compose.phtml +++ b/app/views/install/compose.phtml @@ -352,7 +352,7 @@ services: - appwrite-redis:/data:rw clamav: - image: appwrite/clamav:1.3.0 + image: appwrite/clamav:1.2.0 container_name: appwrite-clamav restart: unless-stopped networks: diff --git a/composer.json b/composer.json index 142d67d0b..f7e589480 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,7 @@ "utopia-php/framework": "0.12.*", "utopia-php/abuse": "0.4.*", - "utopia-php/analytics": "0.1.*", + "utopia-php/analytics": "0.2.*", "utopia-php/audit": "0.5.*", "utopia-php/cache": "0.2.*", "utopia-php/cli": "0.10.0", diff --git a/composer.lock b/composer.lock index 24d495dc7..2d4e127a0 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": "40de7f78c6b3d14b63c4ec178dcfe1a2", + "content-hash": "69222438c59581b58de7052befa6ac00", "packages": [ { "name": "adhocore/jwt", @@ -364,12 +364,12 @@ "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "98eeb955cbbe0e5d6f3f818e940c84f66aba427b" + "reference": "de6f1e58e735754b888649495ed4cb9ae3b19589" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/98eeb955cbbe0e5d6f3f818e940c84f66aba427b", - "reference": "98eeb955cbbe0e5d6f3f818e940c84f66aba427b", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/de6f1e58e735754b888649495ed4cb9ae3b19589", + "reference": "de6f1e58e735754b888649495ed4cb9ae3b19589", "shasum": "" }, "require": { @@ -398,7 +398,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "7.3-dev" + "dev-master": "7.4-dev" } }, "autoload": { @@ -460,7 +460,7 @@ "type": "github" } ], - "time": "2021-03-21T18:42:29+00:00" + "time": "2021-03-23T14:07:59+00:00" }, { "name": "guzzlehttp/promises", @@ -1388,16 +1388,16 @@ }, { "name": "utopia-php/analytics", - "version": "0.1.0", + "version": "0.2.0", "source": { "type": "git", "url": "https://github.com/utopia-php/analytics.git", - "reference": "a1f2a1672a927bef8cd4d9b47e5cfbc856a3c72f" + "reference": "adfc2d057a7f6ab618a77c8a20ed3e35485ff416" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/analytics/zipball/a1f2a1672a927bef8cd4d9b47e5cfbc856a3c72f", - "reference": "a1f2a1672a927bef8cd4d9b47e5cfbc856a3c72f", + "url": "https://api.github.com/repos/utopia-php/analytics/zipball/adfc2d057a7f6ab618a77c8a20ed3e35485ff416", + "reference": "adfc2d057a7f6ab618a77c8a20ed3e35485ff416", "shasum": "" }, "require": { @@ -1437,9 +1437,9 @@ ], "support": { "issues": "https://github.com/utopia-php/analytics/issues", - "source": "https://github.com/utopia-php/analytics/tree/0.1.0" + "source": "https://github.com/utopia-php/analytics/tree/0.2.0" }, - "time": "2021-02-03T17:07:09+00:00" + "time": "2021-03-23T21:33:07+00:00" }, { "name": "utopia-php/audit", @@ -4996,12 +4996,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "36e4ff2188cb5af6e6e94560b4aaa8042933aa58" + "reference": "5da8b675121f9f4419b7052caa0cc6118a3ccd47" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/36e4ff2188cb5af6e6e94560b4aaa8042933aa58", - "reference": "36e4ff2188cb5af6e6e94560b4aaa8042933aa58", + "url": "https://api.github.com/repos/symfony/console/zipball/5da8b675121f9f4419b7052caa0cc6118a3ccd47", + "reference": "5da8b675121f9f4419b7052caa0cc6118a3ccd47", "shasum": "" }, "require": { @@ -5087,7 +5087,7 @@ "type": "tidelift" } ], - "time": "2021-03-17T16:56:09+00:00" + "time": "2021-03-23T14:20:07+00:00" }, { "name": "symfony/deprecation-contracts", @@ -5095,12 +5095,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "49dc45a74cbac5fffc6417372a9f5ae1682ca0b4" + "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/49dc45a74cbac5fffc6417372a9f5ae1682ca0b4", - "reference": "49dc45a74cbac5fffc6417372a9f5ae1682ca0b4", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5f38c8804a9e97d23e0c8d63341088cd8a22d627", + "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627", "shasum": "" }, "require": { @@ -5155,7 +5155,7 @@ "type": "tidelift" } ], - "time": "2021-02-25T16:38:04+00:00" + "time": "2021-03-23T23:28:01+00:00" }, { "name": "symfony/polyfill-intl-grapheme", @@ -5575,12 +5575,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "3d72b4bfab3e991aa66906aa301aa479de4ca6ee" + "reference": "1309413986521646bb0ba91140afdc2a61ed8cfe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/3d72b4bfab3e991aa66906aa301aa479de4ca6ee", - "reference": "3d72b4bfab3e991aa66906aa301aa479de4ca6ee", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/1309413986521646bb0ba91140afdc2a61ed8cfe", + "reference": "1309413986521646bb0ba91140afdc2a61ed8cfe", "shasum": "" }, "require": { @@ -5647,7 +5647,7 @@ "type": "tidelift" } ], - "time": "2021-03-16T09:10:58+00:00" + "time": "2021-03-23T23:28:01+00:00" }, { "name": "symfony/string", diff --git a/docker-compose.yml b/docker-compose.yml index 217d67a70..c4ad29c64 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -414,7 +414,7 @@ services: - appwrite-redis:/data:rw clamav: - image: appwrite/clamav:1.3.0 + image: appwrite/clamav:1.2.0 container_name: appwrite-clamav networks: - appwrite diff --git a/tests/resources/docker/docker-compose.yml b/tests/resources/docker/docker-compose.yml index c9e4ea3d4..9f4074c54 100644 --- a/tests/resources/docker/docker-compose.yml +++ b/tests/resources/docker/docker-compose.yml @@ -327,7 +327,7 @@ services: - appwrite-redis:/data:rw clamav: - image: appwrite/clamav:1.3.0 + image: appwrite/clamav:1.2.0 container_name: appwrite-clamav restart: unless-stopped networks: