From 99345ceb1c9c0b22c02e10dffc7b10384cbd5b3d Mon Sep 17 00:00:00 2001 From: trilogo-lordee Date: Wed, 10 Feb 2021 14:25:32 +0200 Subject: [PATCH] moving php.ini variables for phpmyadmin to env-example --- docker-compose.yml | 3 +++ env-example | 3 +++ phpmyadmin/Dockerfile | 5 ----- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index d19ba6a5..d27da7cf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -864,6 +864,9 @@ services: - MYSQL_USER=${PMA_USER} - MYSQL_PASSWORD=${PMA_PASSWORD} - MYSQL_ROOT_PASSWORD=${PMA_ROOT_PASSWORD} + - MAX_EXECUTION_TIME=${PMA_MAX_EXECUTION_TIME} + - MEMORY_LIMIT=${PMA_MEMORY_LIMIT} + - UPLOAD_LIMIT=${PMA_UPLOAD_LIMIT} ports: - "${PMA_PORT}:80" depends_on: diff --git a/env-example b/env-example index 0585bfda..963c90f8 100644 --- a/env-example +++ b/env-example @@ -483,6 +483,9 @@ PMA_USER=default PMA_PASSWORD=secret PMA_ROOT_PASSWORD=secret PMA_PORT=8081 +PMA_MAX_EXECUTION_TIME=600 +PMA_MEMORY_LIMIT=256M +PMA_UPLOAD_LIMIT=2G ### MAILDEV ############################################### diff --git a/phpmyadmin/Dockerfile b/phpmyadmin/Dockerfile index ded59baf..75812d9b 100644 --- a/phpmyadmin/Dockerfile +++ b/phpmyadmin/Dockerfile @@ -5,10 +5,5 @@ LABEL maintainer="Bo-Yi Wu " # Add volume for sessions to allow session persistence VOLUME /sessions -RUN echo '' >> /usr/local/etc/php/conf.d/php-phpmyadmin.ini \ - && echo '[PHP]' >> /usr/local/etc/php/conf.d/php-phpmyadmin.ini \ - && echo 'post_max_size = 2G' >> /usr/local/etc/php/conf.d/php-phpmyadmin.ini \ - && echo 'upload_max_filesize = 2G' >> /usr/local/etc/php/conf.d/php-phpmyadmin.ini - # We expose phpMyAdmin on port 80 EXPOSE 80