diff --git a/.travis.yml b/.travis.yml index 9af6c8fead..a04ad66658 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ before_install: install: - docker --version - docker-compose up -d -- sleep 15 +- sleep 60 script: - docker ps diff --git a/Dockerfile b/Dockerfile index d48e9cb0e6..5509f4bfd5 100755 --- a/Dockerfile +++ b/Dockerfile @@ -14,9 +14,9 @@ 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.2 \ - PHP_SWOOLE_VERSION=4.5.6 \ +ENV PHP_REDIS_VERSION=5.3.2 \ + PHP_SWOOLE_VERSION=v4.5.6 \ + PHP_MAXMINDDB_VERSION=v1.8.0 \ PHP_XDEBUG_VERSION=sdebug_2_9-beta RUN \ @@ -26,8 +26,6 @@ RUN \ autoconf \ gcc \ g++ \ - tar \ - wget \ git \ zlib-dev \ brotli-dev \ @@ -37,9 +35,9 @@ RUN docker-php-ext-install sockets RUN \ # Redis Extension - wget -q https://github.com/phpredis/phpredis/archive/$PHP_REDIS_VERSION.tar.gz && \ - tar -xf $PHP_REDIS_VERSION.tar.gz && \ - cd phpredis-$PHP_REDIS_VERSION && \ + git clone https://github.com/phpredis/phpredis.git && \ + cd phpredis && \ + git checkout $PHP_REDIS_VERSION && \ phpize && \ ./configure && \ make && make install && \ @@ -47,14 +45,16 @@ RUN \ ## Swoole Extension git clone https://github.com/swoole/swoole-src.git && \ cd swoole-src && \ - git checkout v$PHP_SWOOLE_VERSION && \ + git checkout $PHP_SWOOLE_VERSION && \ phpize && \ ./configure --enable-sockets --enable-http2 && \ make && make install && \ cd .. && \ ## Maxminddb extension git clone https://github.com/maxmind/MaxMind-DB-Reader-php.git && \ - cd MaxMind-DB-Reader-php/ext && \ + cd MaxMind-DB-Reader-php && \ + git checkout $PHP_MAXMINDDB_VERSION && \ + cd ext && \ phpize && \ ./configure && \ make && make install && \ @@ -66,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/README.md b/README.md index 22b487e7af..d7938a3d7b 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). @@ -141,7 +141,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 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/app/preload.php b/app/preload.php index 9ada9a219e..bbfc142f0d 100644 --- a/app/preload.php +++ b/app/preload.php @@ -29,10 +29,7 @@ foreach ([ realpath(__DIR__ . '/../vendor/twig/twig'), realpath(__DIR__ . '/../vendor/guzzlehttp/guzzle'), realpath(__DIR__ . '/../vendor/domnikl'), - realpath(__DIR__ . '/../vendor/geoip2'), realpath(__DIR__ . '/../vendor/domnikl'), - realpath(__DIR__ . '/../vendor/maxmind'), - realpath(__DIR__ . '/../vendor/maxmind-db'), realpath(__DIR__ . '/../vendor/psr/log'), realpath(__DIR__ . '/../vendor/piwik'), realpath(__DIR__ . '/../vendor/symfony'), 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) { 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()); diff --git a/tests/e2e/Client.php b/tests/e2e/Client.php index e9a47c7350..e2a805a2b5 100644 --- a/tests/e2e/Client.php +++ b/tests/e2e/Client.php @@ -236,7 +236,7 @@ class Client $responseHeaders['status-code'] = $responseStatus; if($responseStatus === 500) { - echo 'Server error(!): '.json_encode($responseBody)."\n"; + echo 'Server error('.$method.': '.$path.'. Params: '.json_encode($params).'): '.json_encode($responseBody)."\n"; } return [