Skip to content
Snippets Groups Projects
Commit b516a8f5 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch '1191-use-php-redis-as-cache-backend' into 'development' 

Resolve "Use PHP-Redis as Cache backend"

Closes #1191

See merge request !1976
parents 4cb11902 d63714e0
No related branches found
No related tags found
2 merge requests!1978Development,!1976Resolve "Use PHP-Redis as Cache backend"
Hide whitespace changes
Inline Side-by-side
build/fpm/Dockerfile
+ 4
− 3
View file @ b516a8f5
...@@ -21,11 +21,12 @@ RUN apt update && apt install -y \ ...@@ -21,11 +21,12 @@ RUN apt update && apt install -y \
libzip-dev \ libzip-dev \
libpng-dev \ libpng-dev \
libfreetype-dev \ libfreetype-dev \
libjpeg62-turbo-dev && \ libjpeg62-turbo-dev \
libzstd-dev && \
docker-php-ext-configure gd --with-freetype --with-jpeg && \ docker-php-ext-configure gd --with-freetype --with-jpeg && \
docker-php-ext-install zip gd pcntl pdo_mysql && \ docker-php-ext-install zip gd pcntl pdo_mysql && \
yes '' | pecl install xdebug-3.1.4 redis-5.3.7 && \ yes 'y' | pecl install xdebug-3.1.4 igbinary-3.2.7 redis-5.3.7 && \
docker-php-ext-enable redis && \ docker-php-ext-enable igbinary redis && \
docker-php-ext-enable --ini-name=xdebug.ini xdebug docker-php-ext-enable --ini-name=xdebug.ini xdebug
# Add working dir for the code base # Add working dir for the code base
......
metager/composer.json
+ 0
− 1
View file @ b516a8f5
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
"jenssegers/agent": "^2.6.4", "jenssegers/agent": "^2.6.4",
"mcamara/laravel-localization": "1.7.0", "mcamara/laravel-localization": "1.7.0",
"mews/captcha": "^3.2.7", "mews/captcha": "^3.2.7",
"predis/predis": "^1.1",
"promphp/prometheus_client_php": "^2.6.0", "promphp/prometheus_client_php": "^2.6.0",
"symfony/dom-crawler": "^6.0" "symfony/dom-crawler": "^6.0"
}, },
......
metager/composer.lock
+ 36
− 102
View file @ b516a8f5
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "0cd0116ea90edf694a7b98c848d97c47", "content-hash": "01e1fc19a614c8f08338d54b8a4a8296",
"packages": [ "packages": [
{ {
"name": "brick/math", "name": "brick/math",
...@@ -927,16 +927,16 @@ ...@@ -927,16 +927,16 @@
}, },
{ {
"name": "intervention/image", "name": "intervention/image",
"version": "2.7.1", "version": "2.7.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Intervention/image.git", "url": "https://github.com/Intervention/image.git",
"reference": "744ebba495319501b873a4e48787759c72e3fb8c" "reference": "04be355f8d6734c826045d02a1079ad658322dad"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Intervention/image/zipball/744ebba495319501b873a4e48787759c72e3fb8c", "url": "https://api.github.com/repos/Intervention/image/zipball/04be355f8d6734c826045d02a1079ad658322dad",
"reference": "744ebba495319501b873a4e48787759c72e3fb8c", "reference": "04be355f8d6734c826045d02a1079ad658322dad",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -979,8 +979,8 @@ ...@@ -979,8 +979,8 @@
"authors": [ "authors": [
{ {
"name": "Oliver Vogel", "name": "Oliver Vogel",
"email": "oliver@olivervogel.com", "email": "oliver@intervention.io",
"homepage": "http://olivervogel.com/" "homepage": "https://intervention.io/"
} }
], ],
"description": "Image handling and manipulation library with support for Laravel integration", "description": "Image handling and manipulation library with support for Laravel integration",
...@@ -995,11 +995,11 @@ ...@@ -995,11 +995,11 @@
], ],
"support": { "support": {
"issues": "https://github.com/Intervention/image/issues", "issues": "https://github.com/Intervention/image/issues",
"source": "https://github.com/Intervention/image/tree/2.7.1" "source": "https://github.com/Intervention/image/tree/2.7.2"
}, },
"funding": [ "funding": [
{ {
"url": "https://www.paypal.me/interventionphp", "url": "https://paypal.me/interventionio",
"type": "custom" "type": "custom"
}, },
{ {
...@@ -1007,7 +1007,7 @@ ...@@ -1007,7 +1007,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2021-12-16T16:49:26+00:00" "time": "2022-05-21T17:30:32+00:00"
}, },
{ {
"name": "jaybizzle/crawler-detect", "name": "jaybizzle/crawler-detect",
...@@ -1146,16 +1146,16 @@ ...@@ -1146,16 +1146,16 @@
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
"version": "v9.12.2", "version": "v9.13.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/framework.git", "url": "https://github.com/laravel/framework.git",
"reference": "b5b5c635f1a93f277b5248725a1f7ffc97e20810" "reference": "87b6cc8bc41d1cf85c7c1401cddde8570a3b95bb"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/b5b5c635f1a93f277b5248725a1f7ffc97e20810", "url": "https://api.github.com/repos/laravel/framework/zipball/87b6cc8bc41d1cf85c7c1401cddde8570a3b95bb",
"reference": "b5b5c635f1a93f277b5248725a1f7ffc97e20810", "reference": "87b6cc8bc41d1cf85c7c1401cddde8570a3b95bb",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1321,7 +1321,7 @@ ...@@ -1321,7 +1321,7 @@
"issues": "https://github.com/laravel/framework/issues", "issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework" "source": "https://github.com/laravel/framework"
}, },
"time": "2022-05-11T13:38:26+00:00" "time": "2022-05-17T14:07:43+00:00"
}, },
{ {
"name": "laravel/sanctum", "name": "laravel/sanctum",
...@@ -1390,16 +1390,16 @@ ...@@ -1390,16 +1390,16 @@
}, },
{ {
"name": "laravel/serializable-closure", "name": "laravel/serializable-closure",
"version": "v1.1.1", "version": "v1.2.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/serializable-closure.git", "url": "https://github.com/laravel/serializable-closure.git",
"reference": "9e4b005daa20b0c161f3845040046dc9ddc1d74e" "reference": "09f0e9fb61829f628205b7c94906c28740ff9540"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/serializable-closure/zipball/9e4b005daa20b0c161f3845040046dc9ddc1d74e", "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/09f0e9fb61829f628205b7c94906c28740ff9540",
"reference": "9e4b005daa20b0c161f3845040046dc9ddc1d74e", "reference": "09f0e9fb61829f628205b7c94906c28740ff9540",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1445,7 +1445,7 @@ ...@@ -1445,7 +1445,7 @@
"issues": "https://github.com/laravel/serializable-closure/issues", "issues": "https://github.com/laravel/serializable-closure/issues",
"source": "https://github.com/laravel/serializable-closure" "source": "https://github.com/laravel/serializable-closure"
}, },
"time": "2022-02-11T19:23:53+00:00" "time": "2022-05-16T17:09:47+00:00"
}, },
{ {
"name": "laravel/tinker", "name": "laravel/tinker",
...@@ -2529,72 +2529,6 @@ ...@@ -2529,72 +2529,6 @@
], ],
"time": "2021-12-04T23:24:31+00:00" "time": "2021-12-04T23:24:31+00:00"
}, },
{
"name": "predis/predis",
"version": "v1.1.10",
"source": {
"type": "git",
"url": "https://github.com/predis/predis.git",
"reference": "a2fb02d738bedadcffdbb07efa3a5e7bd57f8d6e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/predis/predis/zipball/a2fb02d738bedadcffdbb07efa3a5e7bd57f8d6e",
"reference": "a2fb02d738bedadcffdbb07efa3a5e7bd57f8d6e",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
},
"require-dev": {
"phpunit/phpunit": "~4.8"
},
"suggest": {
"ext-curl": "Allows access to Webdis when paired with phpiredis",
"ext-phpiredis": "Allows faster serialization and deserialization of the Redis protocol"
},
"type": "library",
"autoload": {
"psr-4": {
"Predis\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Daniele Alessandri",
"email": "suppakilla@gmail.com",
"homepage": "http://clorophilla.net",
"role": "Creator & Maintainer"
},
{
"name": "Till Krüss",
"homepage": "https://till.im",
"role": "Maintainer"
}
],
"description": "Flexible and feature-complete Redis client for PHP and HHVM",
"homepage": "http://github.com/predis/predis",
"keywords": [
"nosql",
"predis",
"redis"
],
"support": {
"issues": "https://github.com/predis/predis/issues",
"source": "https://github.com/predis/predis/tree/v1.1.10"
},
"funding": [
{
"url": "https://github.com/sponsors/tillkruss",
"type": "github"
}
],
"time": "2022-01-05T17:46:08+00:00"
},
{ {
"name": "promphp/prometheus_client_php", "name": "promphp/prometheus_client_php",
"version": "v2.6.0", "version": "v2.6.0",
...@@ -6693,16 +6627,16 @@ ...@@ -6693,16 +6627,16 @@
}, },
{ {
"name": "laravel/sail", "name": "laravel/sail",
"version": "v1.14.4", "version": "v1.14.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/sail.git", "url": "https://github.com/laravel/sail.git",
"reference": "0e0e51f19c758c79acbda11e3870641fbad5b7d9" "reference": "f00f3a8f83e71436d473cda7700ae7b4b68d26cc"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/sail/zipball/0e0e51f19c758c79acbda11e3870641fbad5b7d9", "url": "https://api.github.com/repos/laravel/sail/zipball/f00f3a8f83e71436d473cda7700ae7b4b68d26cc",
"reference": "0e0e51f19c758c79acbda11e3870641fbad5b7d9", "reference": "f00f3a8f83e71436d473cda7700ae7b4b68d26cc",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -6749,7 +6683,7 @@ ...@@ -6749,7 +6683,7 @@
"issues": "https://github.com/laravel/sail/issues", "issues": "https://github.com/laravel/sail/issues",
"source": "https://github.com/laravel/sail" "source": "https://github.com/laravel/sail"
}, },
"time": "2022-05-12T12:53:10+00:00" "time": "2022-05-18T15:56:59+00:00"
}, },
{ {
"name": "mockery/mockery", "name": "mockery/mockery",
...@@ -8870,16 +8804,16 @@ ...@@ -8870,16 +8804,16 @@
}, },
{ {
"name": "spatie/flare-client-php", "name": "spatie/flare-client-php",
"version": "1.1.1", "version": "1.2.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/spatie/flare-client-php.git", "url": "https://github.com/spatie/flare-client-php.git",
"reference": "1059fd8f229fa016b11063c6be9d1922d036adb7" "reference": "86a380f5b1ce839af04a08f1c8f2697184cdf23f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/spatie/flare-client-php/zipball/1059fd8f229fa016b11063c6be9d1922d036adb7", "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/86a380f5b1ce839af04a08f1c8f2697184cdf23f",
"reference": "1059fd8f229fa016b11063c6be9d1922d036adb7", "reference": "86a380f5b1ce839af04a08f1c8f2697184cdf23f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -8927,7 +8861,7 @@ ...@@ -8927,7 +8861,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/spatie/flare-client-php/issues", "issues": "https://github.com/spatie/flare-client-php/issues",
"source": "https://github.com/spatie/flare-client-php/tree/1.1.1" "source": "https://github.com/spatie/flare-client-php/tree/1.2.0"
}, },
"funding": [ "funding": [
{ {
...@@ -8935,20 +8869,20 @@ ...@@ -8935,20 +8869,20 @@
"type": "github" "type": "github"
} }
], ],
"time": "2022-05-11T09:43:07+00:00" "time": "2022-05-16T12:13:39+00:00"
}, },
{ {
"name": "spatie/ignition", "name": "spatie/ignition",
"version": "1.3.0", "version": "1.3.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/spatie/ignition.git", "url": "https://github.com/spatie/ignition.git",
"reference": "6aa8f1c8c46aff30c9bd4c354dc865eeee2ed59f" "reference": "997363fbcce809b1e55f571997d49017f9c623d9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/spatie/ignition/zipball/6aa8f1c8c46aff30c9bd4c354dc865eeee2ed59f", "url": "https://api.github.com/repos/spatie/ignition/zipball/997363fbcce809b1e55f571997d49017f9c623d9",
"reference": "6aa8f1c8c46aff30c9bd4c354dc865eeee2ed59f", "reference": "997363fbcce809b1e55f571997d49017f9c623d9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -9010,7 +8944,7 @@ ...@@ -9010,7 +8944,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2022-05-12T08:19:04+00:00" "time": "2022-05-16T13:16:07+00:00"
}, },
{ {
"name": "spatie/laravel-ignition", "name": "spatie/laravel-ignition",
......
metager/config/database.php
+ 11
− 10
View file @ b516a8f5
...@@ -110,13 +110,11 @@ return [ ...@@ -110,13 +110,11 @@ return [
'redis' => [ 'redis' => [
'client' => env('REDIS_CLIENT', 'predis'), 'client' => env('REDIS_CLIENT', 'phpredis'),
'options' => [ 'options' => [
'cluster' => 'redis', 'serializer' => Redis::SERIALIZER_IGBINARY,
'parameters' => [ 'compression' => Redis::COMPRESSION_ZSTD,
'password' => env('REDIS_CACHE_PASSWORD', null),
],
], ],
'default' => [ 'default' => [
...@@ -135,12 +133,15 @@ return [ ...@@ -135,12 +133,15 @@ return [
], ],
"clusters" => [ "clusters" => [
'clustercache' => [[ 'clustercache' => [
'host' => env('REDIS_CACHE_HOST', 'localhost'), [
'host' => env('REDIS_CACHE_HOST', 'localhost'),
'port' => env('REDIS_CACHE_PORT', 6379),
]
],
'options' => [
'password' => env('REDIS_CACHE_PASSWORD', null), 'password' => env('REDIS_CACHE_PASSWORD', null),
'port' => env('REDIS_CACHE_PORT', 6379), ],
'database' => 0,
]],
] ]
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment