From c9901177b4a5223df1cada7b759ec31cb5bdd749 Mon Sep 17 00:00:00 2001
From: JJ <jjjay@mac.com>
Date: Tue, 30 Jul 2024 17:26:59 -0400
Subject: [PATCH 1/3] add port so we can see the database

---
 docker-compose.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index a36e80f64..f1d5e5790 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,6 +4,8 @@ services:
     image: mariadb:11.4.2
     volumes:
       - db_data:/var/lib/mysql
+    ports:
+      - "3306:3306"
     restart: always
     environment:
       MYSQL_DATABASE: wordpress

From 043131cabdc1af864addd34320e1dad32642d1af Mon Sep 17 00:00:00 2001
From: JJ <jjjay@mac.com>
Date: Wed, 31 Jul 2024 11:15:51 -0400
Subject: [PATCH 2/3] Add phpMyAdmin and expose on port 8080

Due to the setup of the multisite, it's not possible to use phpmyadmin.stream.wpenv.net to access it.
---
 contributing.md    |  4 ++++
 docker-compose.yml | 11 +++++++++++
 2 files changed, 15 insertions(+)

diff --git a/contributing.md b/contributing.md
index 6a7f72ae2..3e4a53471 100644
--- a/contributing.md
+++ b/contributing.md
@@ -41,6 +41,10 @@ In order to set up Step Debugging in PhpStorm, follow the [official guide](https
 
 We use a [MailHog](https://github.com/mailhog/MailHog) container to capture all emails sent by the WordPress container, available at [stream.wpenv.net:8025](https://stream.wpenv.net:8025).
 
+### phpMyAdmin
+
+[phpMyAdmin ](https://www.phpmyadmin.net/) is available at [stream.wpenv.net:8080](http://stream.wpenv.net:8080/).
+
 ### Scripts and Commands
 
 We use npm as the canonical task runner for the project. The following commands are available:
diff --git a/docker-compose.yml b/docker-compose.yml
index f1d5e5790..db1eb26ae 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,6 +13,17 @@ services:
       MYSQL_PASSWORD: password
       MYSQL_ROOT_PASSWORD: password
 
+  phpmyadmin:
+    image: phpmyadmin/phpmyadmin:5.2.1
+    ports:
+      - "8080:80"
+    depends_on:
+      - mysql
+    environment:
+      PMA_HOST: mysql
+      PMA_USER: root
+      PMA_PASSWORD: password
+
   wordpress:
     image: ghcr.io/xwp/stream-wordpress:${WORDPRESS_IMAGE_VERSION:-latest}
     build:

From 94b73ab38ce183796765be6c0132fd2857d75c02 Mon Sep 17 00:00:00 2001
From: "Mary (JJ) Jay" <jjjay@mac.com>
Date: Wed, 31 Jul 2024 11:44:48 -0400
Subject: [PATCH 3/3] Update docker-compose.yml

Co-authored-by: Piotr Delawski <delawski@users.noreply.github.com>
---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index db1eb26ae..688165808 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,7 +14,7 @@ services:
       MYSQL_ROOT_PASSWORD: password
 
   phpmyadmin:
-    image: phpmyadmin/phpmyadmin:5.2.1
+    image: phpmyadmin:5.2.1
     ports:
       - "8080:80"
     depends_on: