From 8a2fcef39f3c1f9de40e237889433c0a1eda5c4a Mon Sep 17 00:00:00 2001
From: flip111 <flip101@gmail.com>
Date: Sun, 31 May 2020 23:27:53 +0200
Subject: [PATCH 1/2] Unshare php.ini settings of pma and wp, added pma conf

---
 config/pma_config.php               | 4 ++++
 config/pma_php.ini                  | 6 ++++++
 config/{php.conf.ini => wp_php.ini} | 0
 docker-compose.yml                  | 7 +++++--
 docker/wordpress/Dockerfile         | 4 ++++
 5 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 config/pma_config.php
 create mode 100644 config/pma_php.ini
 rename config/{php.conf.ini => wp_php.ini} (100%)
 create mode 100644 docker/wordpress/Dockerfile

diff --git a/config/pma_config.php b/config/pma_config.php
new file mode 100644
index 0000000000..a088ef5d41
--- /dev/null
+++ b/config/pma_config.php
@@ -0,0 +1,4 @@
+<?php
+declare(strict_types=1);
+
+$cfg['LoginCookieValidity'] = 3600 * 8;
\ No newline at end of file
diff --git a/config/pma_php.ini b/config/pma_php.ini
new file mode 100644
index 0000000000..5603ac5194
--- /dev/null
+++ b/config/pma_php.ini
@@ -0,0 +1,6 @@
+file_uploads = On
+memory_limit = 500M
+upload_max_filesize = 30M
+post_max_size = 30M
+max_execution_time = 600
+session.gc_maxlifetime = 28800
diff --git a/config/php.conf.ini b/config/wp_php.ini
similarity index 100%
rename from config/php.conf.ini
rename to config/wp_php.ini
diff --git a/docker-compose.yml b/docker-compose.yml
index db00f3cd75..d9b66e21ba 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,7 +6,7 @@ services:
     ports:
       - ${IP}:80:80 # change ip if required
     volumes:
-      - ./config/php.conf.ini:/usr/local/etc/php/conf.d/conf.ini
+      - ./config/wp_php.ini:/usr/local/etc/php/conf.d/conf.ini
       - ./wp-app:/var/www/html # Full wordpress project
       #- ./plugin-name/trunk/:/var/www/html/wp-content/plugins/plugin-name # Plugin development
       #- ./theme-name/trunk/:/var/www/html/wp-content/themes/theme-name # Theme development
@@ -23,7 +23,7 @@ services:
   wpcli:
     image: wordpress:cli
     volumes:
-      - ./config/php.conf.ini:/usr/local/etc/php/conf.d/conf.ini
+      - ./config/wp_php.ini:/usr/local/etc/php/conf.d/conf.ini
       - ./wp-app:/var/www/html
     depends_on:
       - db
@@ -40,6 +40,9 @@ services:
       - ${IP}:8080:80
     links:
       - db:db
+    volumes:
+     - ./config/pma_php.ini:/usr/local/etc/php/conf.d/conf.ini
+     - ./config/pma_config.php:/etc/phpmyadmin/config.user.inc.php
 
   db:
     image: mysql:latest # https://hub.docker.com/_/mysql/ - or mariadb https://hub.docker.com/_/mariadb
diff --git a/docker/wordpress/Dockerfile b/docker/wordpress/Dockerfile
new file mode 100644
index 0000000000..a0c55beb0a
--- /dev/null
+++ b/docker/wordpress/Dockerfile
@@ -0,0 +1,4 @@
+ARG WP_IMAGE='wordpress:latest'
+FROM ${WP_IMAGE}
+
+# Include custom build code 
\ No newline at end of file

From 1f94dcd10edafd6fc557298fee3f9a5b927e833f Mon Sep 17 00:00:00 2001
From: Harald Nezbeda <hn@nezhar.com>
Date: Tue, 20 Feb 2024 23:06:04 +0100
Subject: [PATCH 2/2] Delete docker/wordpress/Dockerfile

---
 docker/wordpress/Dockerfile | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 docker/wordpress/Dockerfile

diff --git a/docker/wordpress/Dockerfile b/docker/wordpress/Dockerfile
deleted file mode 100644
index a0c55beb0a..0000000000
--- a/docker/wordpress/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-ARG WP_IMAGE='wordpress:latest'
-FROM ${WP_IMAGE}
-
-# Include custom build code 
\ No newline at end of file