From 3638361e0fc3aa1e9315af3c058f4721b43dafc7 Mon Sep 17 00:00:00 2001 From: SpiralBrad Date: Fri, 23 Feb 2024 16:23:39 -0600 Subject: [PATCH 1/3] Updates phpmyadmin to use 5.2.1 --- builders/phpmyadmin.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/builders/phpmyadmin.js b/builders/phpmyadmin.js index 30097f1..d959e36 100644 --- a/builders/phpmyadmin.js +++ b/builders/phpmyadmin.js @@ -8,10 +8,11 @@ const semver = require('semver'); module.exports = { name: 'phpmyadmin', config: { - version: '5.1', - supported: ['5.1', '5.0', '4.9', '4.8', '4.7', '4.6'], + version: '5.2', + supported: ['5.2', '5.1', '5.0', '4.9', '4.8', '4.7', '4.6'], legacy: ['4.9', '4.8', '4.7', '4.6'], pinPairs: { + '5.2': 'phpmyadmin/phpmyadmin:5.2.1', '5.1': 'phpmyadmin/phpmyadmin:5.1.1', '5.0': 'phpmyadmin/phpmyadmin:5.0.2', }, From 81c748d8dfa4305e6520c09e32e024f1f10c764b Mon Sep 17 00:00:00 2001 From: SpiralBrad Date: Fri, 13 Dec 2024 12:59:32 -0600 Subject: [PATCH 2/3] Updates the examples + leia tests to phpmyadmin 5.2 --- examples/5.x/.lando.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/5.x/.lando.yml b/examples/5.x/.lando.yml index a4784ba..e43e467 100644 --- a/examples/5.x/.lando.yml +++ b/examples/5.x/.lando.yml @@ -1,12 +1,12 @@ name: lando-pma services: pma: - type: phpmyadmin:5.1 + type: phpmyadmin:5.2 hosts: - database - database2 pma_theme: - type: phpmyadmin:5.0 + type: phpmyadmin:5.2 hosts: - database - database2 From 608a2beef15ec4fd4f6865dd8e5d6b6286d0a1c6 Mon Sep 17 00:00:00 2001 From: SpiralBrad Date: Fri, 13 Dec 2024 20:31:12 -0600 Subject: [PATCH 3/3] Improves a test bash command --- examples/5.x/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/5.x/README.md b/examples/5.x/README.md index adc4edb..96e1214 100644 --- a/examples/5.x/README.md +++ b/examples/5.x/README.md @@ -40,7 +40,7 @@ lando ssh -s pma -c "env | grep PMA_HOSTS=database,database2" lando ssh -s pma_theme -c "env | grep PMA_HOSTS=database,database2" # Should have set a custom config file if specified -lando ssh -s pma_theme -c "cat /etc/phpmyadmin/config.user.inc.php" | grep ThemeDefault | grep pmaterial +lando ssh -s pma_theme -c "cat /etc/phpmyadmin/config.user.inc.php | grep ThemeDefault | grep pmaterial" ``` Destroy tests