From 2dfd037749a7ab0059633c000138fe76199be6d7 Mon Sep 17 00:00:00 2001 From: Adrian Hopek Date: Tue, 8 Mar 2022 10:42:37 +0100 Subject: [PATCH] test --- .env.example | 1 + composer.json | 1 + composer.lock | 71 +++++++++++++++++++++++++++++++++++++-- docker/dev/php/Dockerfile | 7 ++-- 4 files changed, 73 insertions(+), 7 deletions(-) diff --git a/.env.example b/.env.example index fe3a597..afb75cb 100644 --- a/.env.example +++ b/.env.example @@ -30,6 +30,7 @@ DOCKER_TEST_DB_PASSWORD=${DB_PASSWORD} DOCKER_TEST_DB_ROOT_PASSWORD=${DB_ROOT_PASSWORD} REDIS_PORT=6379 +REDIS_CLIENT=predis REDIS_HOST=toby-redis XDG_CONFIG_HOME=/tmp diff --git a/composer.json b/composer.json index b1bc7d3..7f21608 100644 --- a/composer.json +++ b/composer.json @@ -19,6 +19,7 @@ "laravel/telescope": "^4.6", "laravel/tinker": "^2.5", "maatwebsite/excel": "^3.1", + "predis/predis": "^1.1", "rackbeat/laravel-ui-avatars": "^1.0", "spatie/laravel-google-calendar": "^3.5", "spatie/laravel-model-states": "^2.1" diff --git a/composer.lock b/composer.lock index 6f6abe7..6b8a37c 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": "937eef6310bd4bb12f1d0ccb623946d1", + "content-hash": "c5b402774b90f0e4bb912ca08a44a143", "packages": [ { "name": "asm89/stack-cors", @@ -4137,6 +4137,72 @@ ], "time": "2022-01-30T08:50:05+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": "psr/cache", "version": "2.0.0", @@ -10983,7 +11049,8 @@ "prefer-lowest": false, "platform": { "php": "^8.1", - "ext-pdo": "*" + "ext-pdo": "*", + "ext-redis": "*" }, "platform-dev": [], "plugin-api-version": "2.1.0" diff --git a/docker/dev/php/Dockerfile b/docker/dev/php/Dockerfile index d068a6c..150cc77 100644 --- a/docker/dev/php/Dockerfile +++ b/docker/dev/php/Dockerfile @@ -9,17 +9,14 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \ && docker-php-ext-enable xdebug \ ;fi -RUN apk add --no-cache pcre-dev $PHPIZE_DEPS \ +RUN apk add --no-cache \ postgresql-dev \ zip \ libzip-dev \ libpng-dev \ - && pecl install redis \ && docker-php-ext-install \ pdo_pgsql \ zip \ gd \ && docker-php-ext-configure \ - zip \ - && docker-php-ext-enable \ - redis + zip