Merge branch '0.7.x' of github.com:appwrite/appwrite into feat-upgrade-php-version

This commit is contained in:
Eldad Fux 2020-10-27 20:08:20 +02:00
commit e8fb01604c
6 changed files with 9 additions and 12 deletions

View file

@ -32,7 +32,7 @@ before_install:
install:
- docker --version
- docker-compose up -d
- sleep 30
- sleep 60
script:
- docker ps

View file

@ -14,8 +14,7 @@ RUN composer update --ignore-platform-reqs --optimize-autoloader \
FROM php:8.0.0RC2-cli-alpine as step1
ENV TZ=Asia/Tel_Aviv \
PHP_REDIS_VERSION=5.3.2 \
ENV PHP_REDIS_VERSION=5.3.2 \
PHP_SWOOLE_VERSION=v4.5.6 \
PHP_IMAGICK_VERSION=master \
PHP_YAML_VERSION=2.2.0b2 \
@ -87,8 +86,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 \

View file

@ -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<nobr> 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

View file

@ -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);

View file

@ -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) {

View file

@ -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());