From a7ec9746fa7258c954c96acd32b2603e04fdb627 Mon Sep 17 00:00:00 2001 From: Oliver Vogel Date: Sun, 14 Jan 2024 10:49:20 +0100 Subject: [PATCH] Clean up docker development environment --- Dockerfile | 30 ++++++++---------------------- docker-compose.yml | 8 ++++++++ 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/Dockerfile b/Dockerfile index b0501fbc..84d6b4e2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,36 +1,22 @@ FROM php:8.1-cli +# install dependencies RUN apt update \ && apt install -y \ - libpng-dev \ - libicu-dev \ - libavif-dev \ - libpq-dev \ - libzip-dev \ - zip \ - zlib1g-dev \ - locales \ - locales-all \ libmagickwand-dev \ libwebp-dev \ + libpng-dev \ + libavif-dev \ && pecl install imagick \ + && pecl install xdebug \ && docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-avif \ - && docker-php-ext-enable imagick \ + && docker-php-ext-enable \ + imagick \ + xdebug \ && docker-php-ext-install \ - intl \ - opcache \ - pdo \ - pdo_pgsql \ - pdo_mysql \ - pgsql \ - fileinfo \ - mysqli \ gd \ - bcmath \ exif \ - zip \ && apt-get clean # install composer -# -RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer +COPY --from=composer /usr/bin/composer /usr/bin/composer diff --git a/docker-compose.yml b/docker-compose.yml index 63412113..890602f0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,6 +7,14 @@ services: command: bash -c "composer install && ./vendor/bin/phpunit -vvv" volumes: - ./:/project + coverage: + build: ./ + working_dir: /project + command: bash -c "composer install && ./vendor/bin/phpunit --coverage-text" + volumes: + - ./:/project + environment: + - XDEBUG_MODE=coverage analysis: build: ./ working_dir: /project