diff --git a/Dockerfile b/Dockerfile index 6e3bc4662e7..592d4ed005b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,6 +30,7 @@ RUN apt-get update \ ; RUN docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql \ + && docker-php-ext-configure gd --with-freetype-dir=/usr/include/freetype2 --with-png-dir=/usr/include --with-jpeg-dir=/usr/include \ && docker-php-ext-install -j$(nproc) zip gd mysqli pdo_mysql opcache intl pgsql pdo_pgsql \ ; diff --git a/dockerbuild/php.ini b/dockerbuild/php.ini index 8482f7ea93e..bdd92b0a04f 100644 --- a/dockerbuild/php.ini +++ b/dockerbuild/php.ini @@ -3,3 +3,4 @@ opcache.max_accelerated_files = 20000 opcache.memory_consumption=256 realpath_cache_size = 4096K realpath_cache_ttl = 600 +memory_limit = 512M diff --git a/src/Eccube/Command/GenerateDummyDataCommand.php b/src/Eccube/Command/GenerateDummyDataCommand.php index 0cf6fc239c4..6340fcc07c0 100644 --- a/src/Eccube/Command/GenerateDummyDataCommand.php +++ b/src/Eccube/Command/GenerateDummyDataCommand.php @@ -13,7 +13,7 @@ namespace Eccube\Command; -use Doctrine\ORM\EntityManager; +use Doctrine\ORM\EntityManagerInterface; use Eccube\Entity\Master\OrderStatus; use Eccube\Repository\DeliveryRepository; use Eccube\Repository\ProductRepository; @@ -48,7 +48,7 @@ class GenerateDummyDataCommand extends Command */ protected $productRepository; - public function __construct(Generator $generator = null, EntityManager $entityManager = null, DeliveryRepository $deliveryRepository = null, ProductRepository $productRepository = null) + public function __construct(Generator $generator = null, EntityManagerInterface $entityManager = null, DeliveryRepository $deliveryRepository = null, ProductRepository $productRepository = null) { parent::__construct(); $this->generator = $generator;