From 5b624419b770f3dfe7eaec29b98a7547327e3f90 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Mon, 6 Jul 2020 10:38:56 +0300 Subject: [PATCH] Fixed workers env vars --- bin/schedule | 2 +- bin/worker-audits | 2 +- bin/worker-certificates | 2 +- bin/worker-deletes | 2 +- bin/worker-mails | 2 +- bin/worker-tasks | 2 +- bin/worker-usage | 2 +- bin/worker-webhooks | 2 +- composer.lock | 56 ++++++++++++++--------------- docker-compose.yml | 80 +++++++++++++++++++++++++++++++++++++++++ 10 files changed, 116 insertions(+), 36 deletions(-) diff --git a/bin/schedule b/bin/schedule index 753ddd3ef..a9b05916f 100644 --- a/bin/schedule +++ b/bin/schedule @@ -1,3 +1,3 @@ #!/bin/bash -REDIS_BACKEND='${_APP_REDIS_HOST}:${_APP_REDIS_PORT}' RESQUE_PHP='/usr/src/code/vendor/autoload.php' php /usr/src/code/vendor/bin/resque-scheduler \ No newline at end of file +REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}" RESQUE_PHP='/usr/src/code/vendor/autoload.php' php /usr/src/code/vendor/bin/resque-scheduler \ No newline at end of file diff --git a/bin/worker-audits b/bin/worker-audits index 3ec78c92d..3befdbc04 100644 --- a/bin/worker-audits +++ b/bin/worker-audits @@ -1,3 +1,3 @@ #!/bin/bash -QUEUE='v1-audits' APP_INCLUDE='/usr/src/code/app/workers/audits.php' REDIS_BACKEND='${_APP_REDIS_HOST}:${_APP_REDIS_PORT}' php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php \ No newline at end of file +QUEUE='v1-audits' APP_INCLUDE='/usr/src/code/app/workers/audits.php' REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}" php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php \ No newline at end of file diff --git a/bin/worker-certificates b/bin/worker-certificates index b974b65f1..f2a1bde94 100644 --- a/bin/worker-certificates +++ b/bin/worker-certificates @@ -1,3 +1,3 @@ #!/bin/bash -QUEUE='v1-certificates' APP_INCLUDE='/usr/src/code/app/workers/certificates.php' REDIS_BACKEND='${_APP_REDIS_HOST}:${_APP_REDIS_PORT}' php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php \ No newline at end of file +QUEUE='v1-certificates' APP_INCLUDE='/usr/src/code/app/workers/certificates.php' REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}" php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php \ No newline at end of file diff --git a/bin/worker-deletes b/bin/worker-deletes index fedfaa2c5..6c623bfd4 100644 --- a/bin/worker-deletes +++ b/bin/worker-deletes @@ -1,3 +1,3 @@ #!/bin/bash -QUEUE='v1-deletes' APP_INCLUDE='/usr/src/code/app/workers/deletes.php' REDIS_BACKEND='${_APP_REDIS_HOST}:${_APP_REDIS_PORT}' php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php \ No newline at end of file +QUEUE='v1-deletes' APP_INCLUDE='/usr/src/code/app/workers/deletes.php' REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}" php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php \ No newline at end of file diff --git a/bin/worker-mails b/bin/worker-mails index d0748acbf..7c6ae5f91 100644 --- a/bin/worker-mails +++ b/bin/worker-mails @@ -1,3 +1,3 @@ #!/bin/bash -QUEUE='v1-mails' APP_INCLUDE='/usr/src/code/app/workers/mails.php' REDIS_BACKEND='${_APP_REDIS_HOST}:${_APP_REDIS_PORT}' php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php \ No newline at end of file +QUEUE='v1-mails' APP_INCLUDE='/usr/src/code/app/workers/mails.php' REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}" php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php \ No newline at end of file diff --git a/bin/worker-tasks b/bin/worker-tasks index e5ee8caae..1474dd286 100644 --- a/bin/worker-tasks +++ b/bin/worker-tasks @@ -1,3 +1,3 @@ #!/bin/bash -QUEUE='v1-usage' APP_INCLUDE='/usr/src/code/app/workers/usage.php' REDIS_BACKEND='${_APP_REDIS_HOST}:${_APP_REDIS_PORT}' php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php \ No newline at end of file +QUEUE='v1-tasks' APP_INCLUDE='/usr/src/code/app/workers/tasks.php' REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}" php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php \ No newline at end of file diff --git a/bin/worker-usage b/bin/worker-usage index e5ee8caae..c570eeed7 100644 --- a/bin/worker-usage +++ b/bin/worker-usage @@ -1,3 +1,3 @@ #!/bin/bash -QUEUE='v1-usage' APP_INCLUDE='/usr/src/code/app/workers/usage.php' REDIS_BACKEND='${_APP_REDIS_HOST}:${_APP_REDIS_PORT}' php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php \ No newline at end of file +QUEUE='v1-usage' APP_INCLUDE='/usr/src/code/app/workers/usage.php' REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}" php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php \ No newline at end of file diff --git a/bin/worker-webhooks b/bin/worker-webhooks index 920e9fb14..9686961a9 100644 --- a/bin/worker-webhooks +++ b/bin/worker-webhooks @@ -1,3 +1,3 @@ #!/bin/bash -QUEUE='v1-webhooks' APP_INCLUDE='/usr/src/code/app/workers/webhooks.php' REDIS_BACKEND='${_APP_REDIS_HOST}:${_APP_REDIS_PORT}' php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php \ No newline at end of file +QUEUE='v1-webhooks' APP_INCLUDE='/usr/src/code/app/workers/webhooks.php' REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}" php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php \ No newline at end of file diff --git a/composer.lock b/composer.lock index 00130d6b7..3499778c8 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": "7fe8eb603ac13489edb3843a93ee3356", + "content-hash": "6faf79daa7c1931e3977c49baa44200b", "packages": [ { "name": "appwrite/php-clamav", @@ -1596,16 +1596,16 @@ }, { "name": "utopia-php/framework", - "version": "0.7.5", + "version": "0.8.0", "source": { "type": "git", "url": "https://github.com/utopia-php/framework.git", - "reference": "a1fcf67f2bd04094490277b6e4516b67e90c9b06" + "reference": "de93b6391ad93e46a5a6573527d0d82d93fb2c1a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/framework/zipball/a1fcf67f2bd04094490277b6e4516b67e90c9b06", - "reference": "a1fcf67f2bd04094490277b6e4516b67e90c9b06", + "url": "https://api.github.com/repos/utopia-php/framework/zipball/de93b6391ad93e46a5a6573527d0d82d93fb2c1a", + "reference": "de93b6391ad93e46a5a6573527d0d82d93fb2c1a", "shasum": "" }, "require": { @@ -1636,7 +1636,7 @@ "php", "upf" ], - "time": "2020-07-04T13:46:40+00:00" + "time": "2020-07-04T22:01:06+00:00" }, { "name": "utopia-php/locale", @@ -1686,16 +1686,16 @@ }, { "name": "utopia-php/registry", - "version": "0.2.1", + "version": "0.2.3", "source": { "type": "git", "url": "https://github.com/utopia-php/registry.git", - "reference": "2cd2d318067a6b310c35c9f3ad73d2ce3c1ca7d5" + "reference": "948aa82942a1bde8b97ec74fdc1a83fb24122788" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/registry/zipball/2cd2d318067a6b310c35c9f3ad73d2ce3c1ca7d5", - "reference": "2cd2d318067a6b310c35c9f3ad73d2ce3c1ca7d5", + "url": "https://api.github.com/repos/utopia-php/registry/zipball/948aa82942a1bde8b97ec74fdc1a83fb24122788", + "reference": "948aa82942a1bde8b97ec74fdc1a83fb24122788", "shasum": "" }, "require": { @@ -1729,7 +1729,7 @@ "upf", "utopia" ], - "time": "2020-06-20T11:46:06+00:00" + "time": "2020-07-04T22:14:07+00:00" } ], "packages-dev": [ @@ -1739,7 +1739,7 @@ "source": { "type": "git", "url": "https://github.com/appwrite/sdk-generator", - "reference": "2b9a55bc447b8b856a8b9dc8c5c86a2c61a6ed3a" + "reference": "8d95a65c802b106f1afd80001d98ea4d92d9faba" }, "require": { "ext-curl": "*", @@ -1769,7 +1769,7 @@ } ], "description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms", - "time": "2020-06-20T07:38:05+00:00" + "time": "2020-07-06T05:12:37+00:00" }, { "name": "doctrine/instantiator", @@ -2239,24 +2239,24 @@ "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "69782012a282be8cc263fd56a8b19341b88cc4b4" + "reference": "693f7f27d9bc2a1fac369ea20e6aff2cc7d96e9f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/69782012a282be8cc263fd56a8b19341b88cc4b4", - "reference": "69782012a282be8cc263fd56a8b19341b88cc4b4", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/693f7f27d9bc2a1fac369ea20e6aff2cc7d96e9f", + "reference": "693f7f27d9bc2a1fac369ea20e6aff2cc7d96e9f", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.0.2", - "php": "^5.3|^7.0", - "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0", - "sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0", - "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0" + "doctrine/instantiator": "^1.2", + "php": "^7.2", + "phpdocumentor/reflection-docblock": "^5.0", + "sebastian/comparator": "^3.0 || ^4.0", + "sebastian/recursion-context": "^3.0 || ^4.0" }, "require-dev": { - "phpspec/phpspec": "^2.5 || ^3.2", - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1" + "phpspec/phpspec": "^6.0", + "phpunit/phpunit": "^8.0" }, "type": "library", "extra": { @@ -2294,7 +2294,7 @@ "spy", "stub" ], - "time": "2020-07-02T09:43:19+00:00" + "time": "2020-07-05T07:41:56+00:00" }, { "name": "phpunit/php-code-coverage", @@ -3340,12 +3340,12 @@ "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "f32950c872a995a93807909bab69387f47afaa25" + "reference": "d190c2e7f7a0475ab86f3185ef34f958d341c5b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/f32950c872a995a93807909bab69387f47afaa25", - "reference": "f32950c872a995a93807909bab69387f47afaa25", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/d190c2e7f7a0475ab86f3185ef34f958d341c5b4", + "reference": "d190c2e7f7a0475ab86f3185ef34f958d341c5b4", "shasum": "" }, "require": { @@ -3397,7 +3397,7 @@ "keywords": [ "templating" ], - "time": "2020-06-22T15:25:21+00:00" + "time": "2020-07-05T13:32:43+00:00" }, { "name": "webmozart/assert", diff --git a/docker-compose.yml b/docker-compose.yml index 8645d6126..839aa6f00 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -136,6 +136,72 @@ services: - _APP_DB_USER - _APP_DB_PASS + appwrite-worker-tasks: + entrypoint: worker-tasks + container_name: appwrite-worker-tasks + build: + context: . + restart: unless-stopped + networks: + - appwrite + depends_on: + - redis + - mariadb + environment: + - _APP_REDIS_HOST + - _APP_REDIS_PORT + - _APP_DB_HOST + - _APP_DB_PORT + - _APP_DB_SCHEMA + - _APP_DB_USER + - _APP_DB_PASS + + appwrite-worker-deletes: + entrypoint: worker-deletes + container_name: appwrite-worker-deletes + build: + context: . + restart: unless-stopped + networks: + - appwrite + depends_on: + - redis + - mariadb + volumes: + - appwrite-uploads:/storage/uploads:rw + - appwrite-cache:/storage/cache:rw + environment: + - _APP_REDIS_HOST + - _APP_REDIS_PORT + - _APP_DB_HOST + - _APP_DB_PORT + - _APP_DB_SCHEMA + - _APP_DB_USER + - _APP_DB_PASS + + appwrite-worker-certificates: + entrypoint: worker-certificates + container_name: appwrite-worker-certificates + build: + context: . + restart: unless-stopped + networks: + - appwrite + depends_on: + - redis + - mariadb + volumes: + - appwrite-config:/storage/config:rw + - appwrite-certificates:/storage/certificates:rw + environment: + - _APP_REDIS_HOST + - _APP_REDIS_PORT + - _APP_DB_HOST + - _APP_DB_PORT + - _APP_DB_SCHEMA + - _APP_DB_USER + - _APP_DB_PASS + appwrite-worker-mails: entrypoint: worker-mails container_name: appwrite-worker-mails @@ -154,6 +220,20 @@ services: - _APP_SMTP_HOST - _APP_SMTP_PORT + appwrite-schedule: + entrypoint: schedule + container_name: appwrite-schedule + build: + context: . + restart: unless-stopped + networks: + - appwrite + depends_on: + - redis + environment: + - _APP_REDIS_HOST + - _APP_REDIS_PORT + mariadb: image: appwrite/mariadb:1.0.3 # fix issues when upgrading using: mysql_upgrade -u root -p container_name: appwrite_mariadb