From 6e3972712874cbd2fd6a27d95e9796d19b335e8c Mon Sep 17 00:00:00 2001 From: Daniel Randell Date: Wed, 17 Jun 2020 19:58:41 +0100 Subject: [PATCH 1/4] add container_name to all of the compose containers --- docker-compose.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 5147ae5c76..ae7c46ed85 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,6 +3,7 @@ version: '3' services: traefik: image: traefik:v2.1.4 + container_name: appwrite_traefik command: - --log.level=DEBUG - --api.insecure=true @@ -86,6 +87,7 @@ services: mariadb: image: appwrite/mariadb:1.0.3 # fix issues when upgrading using: mysql_upgrade -u root -p + container_name: appwrite_mariadb restart: unless-stopped networks: - appwrite @@ -102,6 +104,7 @@ services: maildev: image: djfarrelly/maildev + container_name: appwrite_maildev restart: unless-stopped ports: - '1080:80' @@ -110,6 +113,7 @@ services: # smtp: # image: appwrite/smtp:1.0.1 + # container_name: appwrite_smtp # restart: unless-stopped # networks: # - appwrite @@ -119,6 +123,7 @@ services: redis: image: redis:5.0 + container_name: appwrite_redis restart: unless-stopped networks: - appwrite @@ -127,6 +132,7 @@ services: clamav: image: appwrite/clamav:1.0.9 + container_name: appwrite_clamav restart: unless-stopped networks: - appwrite @@ -135,6 +141,7 @@ services: influxdb: image: influxdb:1.6 + container_name: appwrite_influxdb restart: unless-stopped networks: - appwrite @@ -143,6 +150,7 @@ services: telegraf: image: appwrite/telegraf:1.0.0 + container_name: appwrite_telegraf restart: unless-stopped networks: - appwrite @@ -172,6 +180,7 @@ services: chronograf: image: chronograf:1.5 + container_name: appwrite_chronograf restart: unless-stopped networks: - appwrite From 4cbaa86241c8a004ec3c7fa9c0a606afe7095722 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Thu, 18 Jun 2020 07:52:20 +0300 Subject: [PATCH 2/4] Updated change log --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index e1ce00c74f..ec54ccf1bb 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -16,6 +16,7 @@ - New Doctor CLI to debug the Appwrite server ([#415](https://github.com/appwrite/appwrite/issues/415)) - All emails are now sent asynchronously for improved performance (@TorstenDittmann) - Updated grid for OAuth2 providers list in the console +- Upgraded Redis Resque queue library to version 1.3.6 ## Bug Fixes From 1603039f24ed3a9d3d60114aa43230cb0ec9ca55 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Thu, 18 Jun 2020 07:54:26 +0300 Subject: [PATCH 3/4] Updated change log --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index ec54ccf1bb..9f70fca37a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -17,6 +17,7 @@ - All emails are now sent asynchronously for improved performance (@TorstenDittmann) - Updated grid for OAuth2 providers list in the console - Upgraded Redis Resque queue library to version 1.3.6 +- Added container names to docker-compose.yml (@drandell) ## Bug Fixes From 8c53875992213bdb3b8bb8bc3f9e861944d9e4b4 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Thu, 18 Jun 2020 15:29:35 +0300 Subject: [PATCH 4/4] Updated docs --- .../examples/account/create-o-auth2session.md | 8 +- .../docs/examples/avatars/get-browser.md | 2 +- .../docs/examples/avatars/get-credit-card.md | 2 +- .../docs/examples/avatars/get-favicon.md | 2 +- .../docs/examples/avatars/get-flag.md | 2 +- .../docs/examples/avatars/get-image.md | 2 +- .../docs/examples/avatars/get-initials.md | 2 +- .../docs/examples/avatars/get-q-r.md | 2 +- .../examples/storage/get-file-download.md | 2 +- .../docs/examples/storage/get-file-preview.md | 2 +- .../docs/examples/storage/get-file-view.md | 2 +- .../examples/account/create-o-auth2session.md | 8 +- .../docs/examples/avatars/get-browser.md | 2 +- .../docs/examples/avatars/get-credit-card.md | 2 +- .../docs/examples/avatars/get-favicon.md | 2 +- .../docs/examples/avatars/get-flag.md | 2 +- .../docs/examples/avatars/get-image.md | 2 +- .../docs/examples/avatars/get-initials.md | 2 +- .../docs/examples/avatars/get-q-r.md | 2 +- .../examples/storage/get-file-download.md | 2 +- .../docs/examples/storage/get-file-preview.md | 2 +- .../docs/examples/storage/get-file-view.md | 2 +- composer.lock | 178 ++++++++---------- 23 files changed, 106 insertions(+), 128 deletions(-) diff --git a/app/sdks/client-web/docs/examples/account/create-o-auth2session.md b/app/sdks/client-web/docs/examples/account/create-o-auth2session.md index 0c7430741c..25b02e632e 100644 --- a/app/sdks/client-web/docs/examples/account/create-o-auth2session.md +++ b/app/sdks/client-web/docs/examples/account/create-o-auth2session.md @@ -5,10 +5,6 @@ sdk .setProject('5df5acd0d48c2') // Your project ID ; -let promise = sdk.account.createOAuth2Session('amazon'); +// Go to OAuth provider login page +sdk.account.createOAuth2Session('amazon'); -promise.then(function (response) { - console.log(response); // Success -}, function (error) { - console.log(error); // Failure -}); \ No newline at end of file diff --git a/app/sdks/client-web/docs/examples/avatars/get-browser.md b/app/sdks/client-web/docs/examples/avatars/get-browser.md index 86d0df4a23..0855209f58 100644 --- a/app/sdks/client-web/docs/examples/avatars/get-browser.md +++ b/app/sdks/client-web/docs/examples/avatars/get-browser.md @@ -7,4 +7,4 @@ sdk let result = sdk.avatars.getBrowser('aa'); -console.log(result); // Resource URL +console.log(result); // Resource URL \ No newline at end of file diff --git a/app/sdks/client-web/docs/examples/avatars/get-credit-card.md b/app/sdks/client-web/docs/examples/avatars/get-credit-card.md index 83a1381adf..1aa595bd65 100644 --- a/app/sdks/client-web/docs/examples/avatars/get-credit-card.md +++ b/app/sdks/client-web/docs/examples/avatars/get-credit-card.md @@ -7,4 +7,4 @@ sdk let result = sdk.avatars.getCreditCard('amex'); -console.log(result); // Resource URL +console.log(result); // Resource URL \ No newline at end of file diff --git a/app/sdks/client-web/docs/examples/avatars/get-favicon.md b/app/sdks/client-web/docs/examples/avatars/get-favicon.md index c0ff93307a..a945e50bb2 100644 --- a/app/sdks/client-web/docs/examples/avatars/get-favicon.md +++ b/app/sdks/client-web/docs/examples/avatars/get-favicon.md @@ -7,4 +7,4 @@ sdk let result = sdk.avatars.getFavicon('https://example.com'); -console.log(result); // Resource URL +console.log(result); // Resource URL \ No newline at end of file diff --git a/app/sdks/client-web/docs/examples/avatars/get-flag.md b/app/sdks/client-web/docs/examples/avatars/get-flag.md index 762aeb348e..222b388afc 100644 --- a/app/sdks/client-web/docs/examples/avatars/get-flag.md +++ b/app/sdks/client-web/docs/examples/avatars/get-flag.md @@ -7,4 +7,4 @@ sdk let result = sdk.avatars.getFlag('af'); -console.log(result); // Resource URL +console.log(result); // Resource URL \ No newline at end of file diff --git a/app/sdks/client-web/docs/examples/avatars/get-image.md b/app/sdks/client-web/docs/examples/avatars/get-image.md index 58f0eb8077..3f15981c71 100644 --- a/app/sdks/client-web/docs/examples/avatars/get-image.md +++ b/app/sdks/client-web/docs/examples/avatars/get-image.md @@ -7,4 +7,4 @@ sdk let result = sdk.avatars.getImage('https://example.com'); -console.log(result); // Resource URL +console.log(result); // Resource URL \ No newline at end of file diff --git a/app/sdks/client-web/docs/examples/avatars/get-initials.md b/app/sdks/client-web/docs/examples/avatars/get-initials.md index a54310a6a2..ef04988e2d 100644 --- a/app/sdks/client-web/docs/examples/avatars/get-initials.md +++ b/app/sdks/client-web/docs/examples/avatars/get-initials.md @@ -7,4 +7,4 @@ sdk let result = sdk.avatars.getInitials(); -console.log(result); // Resource URL +console.log(result); // Resource URL \ No newline at end of file diff --git a/app/sdks/client-web/docs/examples/avatars/get-q-r.md b/app/sdks/client-web/docs/examples/avatars/get-q-r.md index fb17032949..9d9ee3fea2 100644 --- a/app/sdks/client-web/docs/examples/avatars/get-q-r.md +++ b/app/sdks/client-web/docs/examples/avatars/get-q-r.md @@ -7,4 +7,4 @@ sdk let result = sdk.avatars.getQR('[TEXT]'); -console.log(result); // Resource URL +console.log(result); // Resource URL \ No newline at end of file diff --git a/app/sdks/client-web/docs/examples/storage/get-file-download.md b/app/sdks/client-web/docs/examples/storage/get-file-download.md index ae3a643529..1323b8b8df 100644 --- a/app/sdks/client-web/docs/examples/storage/get-file-download.md +++ b/app/sdks/client-web/docs/examples/storage/get-file-download.md @@ -7,4 +7,4 @@ sdk let result = sdk.storage.getFileDownload('[FILE_ID]'); -console.log(result); // Resource URL +console.log(result); // Resource URL \ No newline at end of file diff --git a/app/sdks/client-web/docs/examples/storage/get-file-preview.md b/app/sdks/client-web/docs/examples/storage/get-file-preview.md index 30461e4d9a..5ede9fdb93 100644 --- a/app/sdks/client-web/docs/examples/storage/get-file-preview.md +++ b/app/sdks/client-web/docs/examples/storage/get-file-preview.md @@ -7,4 +7,4 @@ sdk let result = sdk.storage.getFilePreview('[FILE_ID]'); -console.log(result); // Resource URL +console.log(result); // Resource URL \ No newline at end of file diff --git a/app/sdks/client-web/docs/examples/storage/get-file-view.md b/app/sdks/client-web/docs/examples/storage/get-file-view.md index 341dd502de..53877ae352 100644 --- a/app/sdks/client-web/docs/examples/storage/get-file-view.md +++ b/app/sdks/client-web/docs/examples/storage/get-file-view.md @@ -7,4 +7,4 @@ sdk let result = sdk.storage.getFileView('[FILE_ID]'); -console.log(result); // Resource URL +console.log(result); // Resource URL \ No newline at end of file diff --git a/app/sdks/console-web/docs/examples/account/create-o-auth2session.md b/app/sdks/console-web/docs/examples/account/create-o-auth2session.md index 4a3523693f..3a2dcba651 100644 --- a/app/sdks/console-web/docs/examples/account/create-o-auth2session.md +++ b/app/sdks/console-web/docs/examples/account/create-o-auth2session.md @@ -6,10 +6,6 @@ sdk .setKey('919c2d18fb5d4...a2ae413da83346ad2') // Your secret API key ; -let promise = sdk.account.createOAuth2Session('amazon'); +// Go to OAuth provider login page +sdk.account.createOAuth2Session('amazon'); -promise.then(function (response) { - console.log(response); // Success -}, function (error) { - console.log(error); // Failure -}); \ No newline at end of file diff --git a/app/sdks/console-web/docs/examples/avatars/get-browser.md b/app/sdks/console-web/docs/examples/avatars/get-browser.md index cd89107b91..bbbdb9738f 100644 --- a/app/sdks/console-web/docs/examples/avatars/get-browser.md +++ b/app/sdks/console-web/docs/examples/avatars/get-browser.md @@ -8,4 +8,4 @@ sdk let result = sdk.avatars.getBrowser('aa'); -console.log(result); // Resource URL +console.log(result); // Resource URL \ No newline at end of file diff --git a/app/sdks/console-web/docs/examples/avatars/get-credit-card.md b/app/sdks/console-web/docs/examples/avatars/get-credit-card.md index 4906a4127c..e1fab01cf2 100644 --- a/app/sdks/console-web/docs/examples/avatars/get-credit-card.md +++ b/app/sdks/console-web/docs/examples/avatars/get-credit-card.md @@ -8,4 +8,4 @@ sdk let result = sdk.avatars.getCreditCard('amex'); -console.log(result); // Resource URL +console.log(result); // Resource URL \ No newline at end of file diff --git a/app/sdks/console-web/docs/examples/avatars/get-favicon.md b/app/sdks/console-web/docs/examples/avatars/get-favicon.md index ec53212364..397986b11a 100644 --- a/app/sdks/console-web/docs/examples/avatars/get-favicon.md +++ b/app/sdks/console-web/docs/examples/avatars/get-favicon.md @@ -8,4 +8,4 @@ sdk let result = sdk.avatars.getFavicon('https://example.com'); -console.log(result); // Resource URL +console.log(result); // Resource URL \ No newline at end of file diff --git a/app/sdks/console-web/docs/examples/avatars/get-flag.md b/app/sdks/console-web/docs/examples/avatars/get-flag.md index 87122bddb3..6e90b72feb 100644 --- a/app/sdks/console-web/docs/examples/avatars/get-flag.md +++ b/app/sdks/console-web/docs/examples/avatars/get-flag.md @@ -8,4 +8,4 @@ sdk let result = sdk.avatars.getFlag('af'); -console.log(result); // Resource URL +console.log(result); // Resource URL \ No newline at end of file diff --git a/app/sdks/console-web/docs/examples/avatars/get-image.md b/app/sdks/console-web/docs/examples/avatars/get-image.md index d6789db732..afd1a17cb5 100644 --- a/app/sdks/console-web/docs/examples/avatars/get-image.md +++ b/app/sdks/console-web/docs/examples/avatars/get-image.md @@ -8,4 +8,4 @@ sdk let result = sdk.avatars.getImage('https://example.com'); -console.log(result); // Resource URL +console.log(result); // Resource URL \ No newline at end of file diff --git a/app/sdks/console-web/docs/examples/avatars/get-initials.md b/app/sdks/console-web/docs/examples/avatars/get-initials.md index 41f8388e1a..dab6417ca5 100644 --- a/app/sdks/console-web/docs/examples/avatars/get-initials.md +++ b/app/sdks/console-web/docs/examples/avatars/get-initials.md @@ -8,4 +8,4 @@ sdk let result = sdk.avatars.getInitials(); -console.log(result); // Resource URL +console.log(result); // Resource URL \ No newline at end of file diff --git a/app/sdks/console-web/docs/examples/avatars/get-q-r.md b/app/sdks/console-web/docs/examples/avatars/get-q-r.md index 93d3438746..31f490cedd 100644 --- a/app/sdks/console-web/docs/examples/avatars/get-q-r.md +++ b/app/sdks/console-web/docs/examples/avatars/get-q-r.md @@ -8,4 +8,4 @@ sdk let result = sdk.avatars.getQR('[TEXT]'); -console.log(result); // Resource URL +console.log(result); // Resource URL \ No newline at end of file diff --git a/app/sdks/console-web/docs/examples/storage/get-file-download.md b/app/sdks/console-web/docs/examples/storage/get-file-download.md index 5be3f81694..0a4677fe80 100644 --- a/app/sdks/console-web/docs/examples/storage/get-file-download.md +++ b/app/sdks/console-web/docs/examples/storage/get-file-download.md @@ -8,4 +8,4 @@ sdk let result = sdk.storage.getFileDownload('[FILE_ID]'); -console.log(result); // Resource URL +console.log(result); // Resource URL \ No newline at end of file diff --git a/app/sdks/console-web/docs/examples/storage/get-file-preview.md b/app/sdks/console-web/docs/examples/storage/get-file-preview.md index 737ead95c3..a44cb6479c 100644 --- a/app/sdks/console-web/docs/examples/storage/get-file-preview.md +++ b/app/sdks/console-web/docs/examples/storage/get-file-preview.md @@ -8,4 +8,4 @@ sdk let result = sdk.storage.getFilePreview('[FILE_ID]'); -console.log(result); // Resource URL +console.log(result); // Resource URL \ No newline at end of file diff --git a/app/sdks/console-web/docs/examples/storage/get-file-view.md b/app/sdks/console-web/docs/examples/storage/get-file-view.md index c9f73b7d28..adfb6320c3 100644 --- a/app/sdks/console-web/docs/examples/storage/get-file-view.md +++ b/app/sdks/console-web/docs/examples/storage/get-file-view.md @@ -8,4 +8,4 @@ sdk let result = sdk.storage.getFileView('[FILE_ID]'); -console.log(result); // Resource URL +console.log(result); // Resource URL \ No newline at end of file diff --git a/composer.lock b/composer.lock index 266096ddd9..ef3e3d104d 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": "303e23dd212555ca04c7f386a9f87256", + "content-hash": "e93c84ab77f0085004222c942dcba6f4", "packages": [ { "name": "appwrite/php-clamav", @@ -100,99 +100,6 @@ "homepage": "https://github.com/Bacon/BaconQrCode", "time": "2018-04-25T17:53:56+00:00" }, - { - "name": "chrisboulton/php-resque", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/chrisboulton/php-resque.git", - "reference": "968b7e6a307a2079051dfc571d2fc2be0546209f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/chrisboulton/php-resque/zipball/968b7e6a307a2079051dfc571d2fc2be0546209f", - "reference": "968b7e6a307a2079051dfc571d2fc2be0546209f", - "shasum": "" - }, - "require": { - "colinmollenhour/credis": "~1.7", - "ext-pcntl": "*", - "php": ">=5.3.0", - "psr/log": "~1.0" - }, - "require-dev": { - "phpunit/phpunit": "3.7.*" - }, - "suggest": { - "ext-proctitle": "Allows php-resque to rename the title of UNIX processes to show the status of a worker.", - "ext-redis": "Native PHP extension for Redis connectivity. Credis will automatically utilize when available." - }, - "bin": [ - "bin/resque" - ], - "type": "library", - "autoload": { - "psr-0": { - "Resque": "lib" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Chris Boulton", - "email": "chris@bigcommerce.com" - } - ], - "description": "Redis backed library for creating background jobs and processing them later. Based on resque for Ruby.", - "homepage": "http://www.github.com/chrisboulton/php-resque/", - "keywords": [ - "background", - "job", - "redis", - "resque" - ], - "abandoned": "resque/php-resque", - "time": "2017-04-12T21:58:19+00:00" - }, - { - "name": "chrisboulton/php-resque-scheduler", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/chrisboulton/php-resque-scheduler.git", - "reference": "5954c989026f1bbc6443c02078a655333e152242" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/chrisboulton/php-resque-scheduler/zipball/5954c989026f1bbc6443c02078a655333e152242", - "reference": "5954c989026f1bbc6443c02078a655333e152242", - "shasum": "" - }, - "require": { - "chrisboulton/php-resque": "dev-master" - }, - "type": "library", - "autoload": { - "psr-0": { - "ResqueScheduler": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Chris Boulton", - "email": "chris@bgigcommerce.com" - } - ], - "description": "php-resque-scheduler is a PHP port of resque-scheduler, which adds support for scheduling items in the future to Resque.", - "time": "2016-11-28T22:38:06+00:00" - }, { "name": "colinmollenhour/credis", "version": "1.11.2", @@ -1135,6 +1042,85 @@ "description": "A polyfill for getallheaders.", "time": "2019-03-08T08:55:37+00:00" }, + { + "name": "resque/php-resque", + "version": "v1.3.6", + "source": { + "type": "git", + "url": "https://github.com/resque/php-resque.git", + "reference": "fe41c04763699b1318d97ed14cc78583e9380161" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/resque/php-resque/zipball/fe41c04763699b1318d97ed14cc78583e9380161", + "reference": "fe41c04763699b1318d97ed14cc78583e9380161", + "shasum": "" + }, + "require": { + "colinmollenhour/credis": "~1.7", + "php": ">=5.6.0", + "psr/log": "~1.0" + }, + "require-dev": { + "phpunit/phpunit": "^5.7" + }, + "suggest": { + "ext-pcntl": "REQUIRED for forking processes on platforms that support it (so anything but Windows).", + "ext-proctitle": "Allows php-resque to rename the title of UNIX processes to show the status of a worker.", + "ext-redis": "Native PHP extension for Redis connectivity. Credis will automatically utilize when available." + }, + "bin": [ + "bin/resque", + "bin/resque-scheduler" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-0": { + "Resque": "lib", + "ResqueScheduler": "lib" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Dan Hunsaker", + "email": "danhunsaker+resque@gmail.com", + "role": "Maintainer" + }, + { + "name": "Rajib Ahmed", + "homepage": "https://github.com/rajibahmed", + "role": "Maintainer" + }, + { + "name": "Steve Klabnik", + "email": "steve@steveklabnik.com", + "role": "Maintainer" + }, + { + "name": "Chris Boulton", + "email": "chris@bigcommerce.com", + "role": "Creator" + } + ], + "description": "Redis backed library for creating background jobs and processing them later. Based on resque for Ruby.", + "homepage": "http://www.github.com/resque/php-resque/", + "keywords": [ + "background", + "job", + "redis", + "resque" + ], + "time": "2020-04-16T16:39:50+00:00" + }, { "name": "symfony/polyfill-intl-idn", "version": "dev-master", @@ -1753,7 +1739,7 @@ "source": { "type": "git", "url": "https://github.com/appwrite/sdk-generator", - "reference": "0125b705aa78e4432972fdcc9de3c42b65ee2024" + "reference": "5183b758ec53db3b6e9529892cacebf842773675" }, "require": { "ext-curl": "*", @@ -1783,7 +1769,7 @@ } ], "description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms", - "time": "2020-06-17T10:09:35+00:00" + "time": "2020-06-18T12:20:14+00:00" }, { "name": "doctrine/instantiator",