From b84306947034095ae0e845abe7ee3e497eb23a60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20=C5=A0tancl?= Date: Wed, 4 Mar 2020 20:40:59 +0100 Subject: [PATCH 1/2] Use dev-master for phpcov --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d68dd1a7..7b876f9a 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "laravel/framework": "^6.0|^7.0", "orchestra/testbench-browser-kit": "^4.0|^5.0", "league/flysystem-aws-s3-v3": "~1.0", - "phpunit/phpcov": "^6.0|^7.0" + "phpunit/phpcov": "dev-master" }, "autoload": { "psr-4": { From 2c9c05b9348cd5a6844040c0257e9a6d9db79e08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20=C5=A0tancl?= Date: Wed, 4 Mar 2020 20:51:18 +0100 Subject: [PATCH 2/2] Cleanup --- Dockerfile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index bd2bfae6..2de25cb0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,6 @@ LABEL maintainer="Samuel Štancl" ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update - RUN apt-get install -y software-properties-common RUN add-apt-repository -y ppa:ondrej/php @@ -16,12 +15,10 @@ RUN apt-get install -y curl zip unzip git sqlite3 \ php7.4-imap php7.4-mysql php7.4-mbstring \ php7.4-xml php7.4-zip php7.4-bcmath php7.4-soap \ php7.4-intl php7.4-readline php7.4-xdebug \ - php-msgpack php-igbinary \ + php7.4-redis php-msgpack php-igbinary \ && php -r "readfile('http://getcomposer.org/installer');" | php -- --install-dir=/usr/bin/ --filename=composer \ && mkdir /run/php -RUN apt-get install -y php7.4-redis - RUN apt-get install -y python3 RUN apt-get install -y php7.4-dev php-pear @@ -32,4 +29,4 @@ RUN apt-get -y autoremove \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -WORKDIR /var/www/html \ No newline at end of file +WORKDIR /var/www/html