From 6c64bb59034570e01d854e2fd18570025fed73c0 Mon Sep 17 00:00:00 2001
From: Uryvskiy Dima <uryvskiydima@gmail.com>
Date: Sun, 24 Sep 2023 14:42:40 +0300
Subject: [PATCH] test

---
 .docker/Dockerfile           | 19 +++++++++++++++----
 .github/workflows/presta.yml |  8 ++++----
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 0c37e75..84e7bf4 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,19 +1,30 @@
-FROM php:7.2-fpm
+FROM php:7.4-fpm
 
-RUN apt-get update && apt-get install -y zlib1g-dev libpq-dev git libicu-dev libxml2-dev libpng-dev libjpeg-dev libmcrypt-dev libxslt-dev libfreetype6-dev unzip nano\
+RUN apt-get update && apt-get install -y \
+    zlib1g-dev \
+    libpq-dev \
+    git \
+    libzip \
+    libicu-dev \
+    libxml2-dev \
+    libpng-dev \
+    libjpeg62-turbo-dev \
+    libmcrypt-dev \
+    libxslt-dev \
+    unzip nano \
     && docker-php-ext-configure intl \
     && docker-php-ext-install intl \
     && docker-php-ext-install mysqli pdo pdo_mysql \
     && docker-php-ext-install zip \
     && docker-php-ext-install xml \
-    && docker-php-ext-configure gd --with-png-dir=/usr/local/ --with-jpeg-dir=/usr/local/ --with-freetype-dir=/usr/local/ \
+    && docker-php-ext-configure gd --with-jpeg=/usr/include/ --with-freetype=/usr/include/ \
     && docker-php-ext-install gd \
     && docker-php-ext-install bcmath \
     && docker-php-ext-install soap \
     && docker-php-ext-install xsl \
     && docker-php-ext-install mbstring \
     && pecl install mcrypt-1.0.1 \
-    && docker-php-ext-enable mcrypt
+    && docker-php-ext-enable mcryp
 
 RUN curl -sSL https://phar.phpunit.de/phpunit-6.phar -o /usr/bin/phpunit && chmod +x /usr/bin/phpunit \
     && curl -sSL https://getcomposer.org/composer.phar -o /usr/bin/composer && chmod +x /usr/bin/composer
diff --git a/.github/workflows/presta.yml b/.github/workflows/presta.yml
index 70b8ba1..0c23b1d 100644
--- a/.github/workflows/presta.yml
+++ b/.github/workflows/presta.yml
@@ -32,10 +32,10 @@ jobs:
             branch: '1.7.8.10'
           - php-version: '7.3'
             branch: '1.7.8.10'
-#          - php-version: '7.4'
-#            branch: '1.7.7.8'
-#            composerv1: 1
-#            coverage: 1
+          - php-version: '7.4'
+            branch: '1.7.7.8'
+            composerv1: 1
+            coverage: 1
 
     services:
       mysql: