Merge pull request #2842 from trilogo-lordee/master

moving php.ini variables for phpmyadmin to env-example

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:

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 ###############################################
 

phpmyadmin/Dockerfile

@@ -5,10 +5,5 @@ LABEL maintainer="Bo-Yi Wu <appleboy.tw@gmail.com>"
 # 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