diff --git a/composer.json b/composer.json index a936f1070..c1ab56b78 100644 --- a/composer.json +++ b/composer.json @@ -94,7 +94,9 @@ "visiosoft/base-theme": "^1.0", "visiosoft/advs-module": "^1.0", "visiosoft/json-field_type": "^1.0", - "visiosoft/language_switcher-plugin": "^1.0" + "visiosoft/language_switcher-plugin": "^1.0", + "predis/predis": "^2.0", + "laravel/horizon": "^5.9" }, "replace": { "anomaly/streams-platform": "*" @@ -104,7 +106,7 @@ "fzaninotto/faker": "~1.4", "symfony/css-selector": "3.1.*", "symfony/dom-crawler": "3.1.*", - "anomaly/installer-module": "~2.4.0" + "laravel/sail": "^1.14" }, "repositories": [ { @@ -149,6 +151,9 @@ "config": { "bin-dir": "bin", "preferred-install": "dist", - "optimize-autoloader": true + "optimize-autoloader": true, + "allow-plugins": { + "visiosoft/composer-merge-plugin": true + } } } diff --git a/config/database.php b/config/database.php index 147e74194..6f4da9de8 100644 --- a/config/database.php +++ b/config/database.php @@ -108,14 +108,21 @@ return [ 'redis' => [ 'cluster' => false, + 'client' => env('REDIS_CLIENT', 'phpredis'), 'default' => [ - 'host' => env('REDIS_HOST', 'localhost'), - 'password' => env('REDIS_PASSWORD', null), - 'port' => env('REDIS_PORT', 6379), - 'database' => 0, + 'host' => env('REDIS_HOST', 'redis'), + 'password' => env('REDIS_PASSWORD'), + 'port' => env('REDIS_PORT', 6379), + 'database' => env('REDIS_DB', 0), ], + 'cache' => [ + 'host' => env('REDIS_HOST', '127.0.0.1'), + 'password' => env('REDIS_PASSWORD'), + 'port' => env('REDIS_PORT', 6379), + 'database' => env('REDIS_CACHE_DB', 1), + ], ], ]; diff --git a/docker-compose.yml b/docker-compose.yml index c527fefa7..33f5e86ca 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,11 +3,11 @@ version: '3' services: laravel.test: build: - context: ./vendor/laravel/sail/runtimes/8.1 + context: ./vendor/laravel/sail/runtimes/7.4 dockerfile: Dockerfile args: WWWGROUP: '${WWWGROUP}' - image: sail-8.1/app + image: sail-7.4/app extra_hosts: - 'host.docker.internal:host-gateway' ports: @@ -20,6 +20,7 @@ services: XDEBUG_CONFIG: '${SAIL_XDEBUG_CONFIG:-client_host=host.docker.internal}' volumes: - '.:/var/www/html' + - './supervisord.conf:/etc/supervisor/conf.d/supervisord.conf' networks: - sail depends_on: @@ -75,6 +76,14 @@ services: - '11211:11211' networks: - sail + crontab.ui: + image: 'alseambusher/crontab-ui' + ports: + - '8181:8181' + environment: + PORT: '8181' + networks: + - sail networks: sail: driver: bridge