From 75160b12821f7f4299cce7f0b69c83c1502ae071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=20Luka=20=C5=A0ijanec?= Date: Mon, 27 May 2024 13:08:29 +0200 Subject: 2024-02-19 upstream --- utils/Docker/Latest/docker-compose.yml | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'utils/Docker/Latest/docker-compose.yml') diff --git a/utils/Docker/Latest/docker-compose.yml b/utils/Docker/Latest/docker-compose.yml index 986104a..2d5cf88 100644 --- a/utils/Docker/Latest/docker-compose.yml +++ b/utils/Docker/Latest/docker-compose.yml @@ -14,22 +14,25 @@ services: - "80:80" volumes: - ../../../:/var/www/html/ - - ./www/config/php-7.4.ini:/usr/local/etc/php/php.ini - - ./www/config/php-local.ini:/usr/local/etc/php/conf.d/local.ini - - ./www/config/1ka.test:/etc/apache2/sites-available/1ka.test + - ./www/config/php-8.1.ini/php.ini:/usr/local/etc/php/php.ini + ##- ./www/config/php-local.ini:/usr/local/etc/php/conf.d/local.ini + ##- ./www/config/1ka.test:/etc/apache2/sites-available/1ka.test - ./www/log/:/var/log/apache2/ networks: - default + environment: + - REALPATH_CACHE_SIZE=32M mysql: container_name: mysql_1ka_latest - image: mysql:5.7 + image: mariadb:10.3 + ##image: mysql:5.6.40 ports: - - "6032:3306" + - "3306:3306" volumes: - ./sql/database:/var/lib/mysql - ./sql/log:/var/log/mysql - - ./sql/config:/etc/mysql + - ./sql/config:/etc/mysql/conf.d networks: - default environment: @@ -37,6 +40,9 @@ services: - MYSQL_ROOT_PASSWORD=1234 - MYSQL_PASSWORD=1234 - MYSQL_DATABASE=1ka + - MYSQL_ALLOW_EMPTY_PASSWORD=true + - REALPATH_CACHE_SIZE=32M + command: mysqld --sql_mode="" --innodb-flush-method=fsync phpmyadmin: container_name: phpmyadmin_1ka_latest @@ -48,6 +54,10 @@ services: environment: - PMA_HOST=mysql - PMA_PORT=3306 + - UPLOAD_LIMIT=300M + - MAX_EXECUTION_TIME=1200 + - MEMORY_LIMIT=1024M + - REALPATH_CACHE_SIZE=32M networks: - default -- cgit v1.2.3