From 52d74917a994ae85dc2e4c1015b84079a26d2a3f Mon Sep 17 00:00:00 2001 From: jakaya123 <34449936+jakaya123@users.noreply.github.com> Date: Mon, 12 Oct 2020 09:21:45 +0530 Subject: [PATCH 1/4] Updated README.md Done a simple alignment change and I have included the link for appwrite's official blog. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 79e683d17a..3eb96ad9f3 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ [![Twitter Account](https://badgen.net/twitter/follow/appwrite_io?label=twitter)](https://twitter.com/appwrite_io) [![Follow Appwrite on StackShare](https://badgen.net/badge/follow%20on/stackshare/blue)](https://stackshare.io/appwrite) -Appwrite is an end-to-end backend server for Web, Mobile, Native, or Backend apps packaged as a set of Docker microservices. Appwrite abstracts the complexity and repetitiveness required to build a modern backend API from scratch and allows you to build secure apps faster. +Appwrite is an end-to-end backend server for Web, Mobile, Native, or Backend apps packaged as a set of Docker microservices. Appwrite abstracts the complexity and repetitiveness required to build a modern backend API from scratch and allows you to build secure apps faster. Using Appwrite, you can easily integrate your app with user authentication & multiple sign-in methods, a database for storing and querying users and team data, storage and file management, image manipulation, schedule CRON tasks, and [more services](https://appwrite.io/docs). @@ -140,7 +140,7 @@ For security issues, kindly email us at [security@appwrite.io](mailto:security@a ## Follow Us -Join our growing community around the world! Follow us on [Twitter](https://twitter.com/appwrite_io), [Facebook Page](https://www.facebook.com/appwrite.io), [Facebook Group](https://www.facebook.com/groups/appwrite.developers/) or join our live [Discord server](https://discord.gg/GSeTUeA) for more help, ideas, and discussions. +Join our growing community around the world! See our official [Blog](https://medium.com/appwrite-io). Follow us on [Twitter](https://twitter.com/appwrite_io), [Facebook Page](https://www.facebook.com/appwrite.io), [Facebook Group](https://www.facebook.com/groups/appwrite.developers/) or join our live [Discord server](https://discord.gg/GSeTUeA) for more help, ideas, and discussions. ## License From db68da6e65234d4e051c9e51c7caf0c0e3f44a6f Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Tue, 27 Oct 2020 19:24:18 +0200 Subject: [PATCH 2/4] Updated default timezone --- Dockerfile | 6 ++---- app/http.php | 2 +- public/index.php | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index fbab296af5..60db675960 100755 --- a/Dockerfile +++ b/Dockerfile @@ -14,8 +14,7 @@ RUN composer update --ignore-platform-reqs --optimize-autoloader \ FROM php:7.4-cli-alpine as step1 -ENV TZ=Asia/Tel_Aviv \ - PHP_REDIS_VERSION=5.3.0 \ +ENV PHP_REDIS_VERSION=5.3.0 \ PHP_SWOOLE_VERSION=v4.5.6 \ PHP_MAXMINDDB_VERSION=v1.8.0 \ PHP_XDEBUG_VERSION=sdebug_2_9-beta @@ -67,8 +66,7 @@ LABEL maintainer="team@appwrite.io" ARG VERSION=dev -ENV TZ=Asia/Tel_Aviv \ - _APP_SERVER=swoole \ +ENV _APP_SERVER=swoole \ _APP_ENV=production \ _APP_DOMAIN=localhost \ _APP_DOMAIN_TARGET=localhost \ diff --git a/app/http.php b/app/http.php index f98acc9d2f..a5f0dbd438 100644 --- a/app/http.php +++ b/app/http.php @@ -93,7 +93,7 @@ $http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swo return; } - $app = new App('Asia/Tel_Aviv'); + $app = new App('America/New_York'); try { $app->run($request, $response); diff --git a/public/index.php b/public/index.php index 01f9dbb117..4b08fcc704 100644 --- a/public/index.php +++ b/public/index.php @@ -22,6 +22,6 @@ error_reporting(E_ALL); include __DIR__ . '/../app/controllers/general.php'; -$app = new App('Asia/Tel_Aviv'); +$app = new App('America/New_York'); $app->run(new Request(), new Response()); From 8aef7194e97d067ee406af95c52992fae24ca51e Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Tue, 27 Oct 2020 19:29:37 +0200 Subject: [PATCH 3/4] Hide version check on dev mode --- app/tasks/doctor.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/tasks/doctor.php b/app/tasks/doctor.php index 0836628bde..0ab19f290e 100644 --- a/app/tasks/doctor.php +++ b/app/tasks/doctor.php @@ -219,15 +219,14 @@ $cli Console::log(''); $version = \json_decode(@\file_get_contents(App::getEnv('_APP_HOME', 'http://localhost').'/v1/health/version'), true); - if($version && isset($version['version'])) { + if ($version && isset($version['version']) && App::isProduction()) { if(\version_compare($version['version'], App::getEnv('_APP_VERSION', 'UNKNOWN')) === 0) { Console::info('You are running the latest version of '.APP_NAME.'! 🥳'); } else { Console::info('A new version ('.$version['version'].') is available! 🥳'."\n"); } - } - else { + } else { Console::error('Failed to check for a newer version'."\n"); } } catch (\Throwable $th) { From addf7adca18b42ace42ab2b8475e615999bc4d5c Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Tue, 27 Oct 2020 19:50:06 +0200 Subject: [PATCH 4/4] Increased CI wait --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 897ef61135..a04ad66658 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ before_install: install: - docker --version - docker-compose up -d -- sleep 30 +- sleep 60 script: - docker ps