Bump MariaDB minor versions and add support for 11.6 and 11.7

CHANGELOG.md

@@ -1,5 +1,10 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
+* Added MariaDB 11.6 and 11.7 to supported versions.
+* Bumped all available MariaDB minor versions.
+* Moved EOL'd versions to legacy.
+* Add patch version testing to 11.4 and 11.5.
+
 ## v1.6.3 - [December 6, 2024](https://github.com/lando/mariadb/releases/tag/v1.6.3)
 
 * Updated the version index.md to get Docuverse page to build correctly.

builders/mariadb.js

@@ -9,25 +9,28 @@ module.exports = {
   name: 'mariadb',
   config: {
     version: '10.3',
-    supported: ['11.5', '11.4', '11.3', '11.2', '11.1', '11.0', '10.11', '10.10', '10.9',
-      '10.8', '10.7', '10.6', '10.5', '10.4', '10.3', '10.2', '10.1'],
-    legacy: ['11.0', '10.10', '10.9', '10.8', '10.7', '10.2',
-      '10.1'],
+    supported: ['11.7', '11.6', '11.5', '11.4', '11.3', '11.2', '11.1',
+      '11.0', '10.11', '10.10', '10.9', '10.8', '10.7', '10.6', '10.5',
+      '10.4', '10.3', '10.2', '10.1'],
+    legacy: ['11.7', '11.6', '11.5', '11.3', '11.2', '11.1', '11.0',
+      '10.10', '10.9', '10.8', '10.7', '10.4', '10.3', '10.2', '10.1'],
     pinPairs: {
-      '11.5': 'bitnami/mariadb:11.5.2-debian-12-r2',
-      '11.4': 'bitnami/mariadb:11.4.3-debian-12-r1',
+      '11.7': 'bitnami/mariadb:11.7.2-debian-12-r0',
+      '11.6': 'bitnami/mariadb:11.6.2-debian-12-r0',
+      '11.5': 'bitnami/mariadb:11.5.2-debian-12-r7',
+      '11.4': 'bitnami/mariadb:11.4.6-debian-12-r0',
       '11.3': 'bitnami/mariadb:11.3.2-debian-12-r9',
-      '11.2': 'bitnami/mariadb:11.2.5-debian-12-r2',
+      '11.2': 'bitnami/mariadb:11.2.6-debian-12-r2',
       '11.1': 'bitnami/mariadb:11.1.6-debian-12-r0',
       '11.0': 'bitnami/mariadb:11.0.6-debian-12-r0',
-      '10.11': 'bitnami/mariadb:10.11.9-debian-12-r1',
+      '10.11': 'bitnami/mariadb:10.11.11-debian-12-r11',
       '10.10': 'bitnami/mariadb:10.10.7-debian-11-r6',
       '10.9': 'bitnami/mariadb:10.9.8-debian-11-r22',
       '10.8': 'bitnami/mariadb:10.8.8-debian-11-r5',
       '10.7': 'bitnami/mariadb:10.7.8-debian-11-r6',
-      '10.6': 'bitnami/mariadb:10.6.18-debian-12-r0',
-      '10.5': 'bitnami/mariadb:10.5.25-debian-12-r0',
-      '10.4': 'bitnami/mariadb:10.4.34-debian-12-r0',
+      '10.6': 'bitnami/mariadb:10.6.20-debian-12-r2',
+      '10.5': 'bitnami/mariadb:10.5.27-debian-12-r2',
+      '10.4': 'bitnami/mariadb:10.4.34-debian-12-r7',
       '10.3': 'bitnami/mariadb:10.3.39-debian-11-r5',
       '10.2': 'bitnami/mariadb:10.2.44-debian-11-r9',
       '10.1': 'bitnami/mariadb:10.1.47-debian-10-r13',

docs/index.md

@@ -18,16 +18,10 @@ services:
 
 ## Supported versions
 
-*   [11.5](https://hub.docker.com/r/bitnami/mariadb/tags?name=11.5.)
 *   [11.4](https://hub.docker.com/r/bitnami/mariadb/tags?name=11.4.)
-*   [11.3](https://hub.docker.com/r/bitnami/mariadb/tags?name=11.3.)
-*   [11.2](https://hub.docker.com/r/bitnami/mariadb/tags?name=11.2.)
-*   [11.1](https://hub.docker.com/r/bitnami/mariadb/tags?name=11.1.)
-*   [11.0](https://hub.docker.com/r/bitnami/mariadb/tags?name=11.0.)
 *   [10.11](https://hub.docker.com/r/bitnami/mariadb/tags?name=10.11.)
 *   [10.6](https://hub.docker.com/r/bitnami/mariadb/tags?name=10.6.)
 *   [10.5](https://hub.docker.com/r/bitnami/mariadb/tags?name=10.5.)
-*   [10.4](https://hub.docker.com/r/bitnami/mariadb/tags?name=10.4.)
 *   **[10.3](https://hub.docker.com/r/bitnami/mariadb/tags?name=10.3.)** **(default)**
 *   [custom](https://docs.lando.dev/core/v3/services/lando.html#overrides)
 
@@ -39,10 +33,18 @@ While you can currently use some [EOL MariaDB version](https://endoflife.date/ma
 
 You can still run these versions with Lando but for all intents and purposes they should be considered deprecated (e.g. YMMV and do not expect a ton of support if you have an issue).
 
+*   [11.7](https://hub.docker.com/r/bitnami/mariadb/tags?name=11.7.)
+*   [11.6](https://hub.docker.com/r/bitnami/mariadb/tags?name=11.6.)
+*   [11.5](https://hub.docker.com/r/bitnami/mariadb/tags?name=11.5.)
+*   [11.3](https://hub.docker.com/r/bitnami/mariadb/tags?name=11.3.)
+*   [11.2](https://hub.docker.com/r/bitnami/mariadb/tags?name=11.2.)
+*   [11.1](https://hub.docker.com/r/bitnami/mariadb/tags?name=11.1.)
+*   [11.0](https://hub.docker.com/r/bitnami/mariadb/tags?name=11.0.)
 *   [10.10](https://hub.docker.com/r/bitnami/mariadb/tags?name=10.10.)
 *   [10.9](https://hub.docker.com/r/bitnami/mariadb/tags?name=10.9.)
 *   [10.8](https://hub.docker.com/r/bitnami/mariadb/tags?name=10.8.)
 *   [10.7](https://hub.docker.com/r/bitnami/mariadb/tags?name=10.7.)
+*   [10.4](https://hub.docker.com/r/bitnami/mariadb/tags?name=10.4.)
 *   [10.2](https://hub.docker.com/r/bitnami/mariadb/tags?name=10.2.)
 *   [10.1](https://hub.docker.com/r/bitnami/mariadb/tags?name=10.1.)
 

examples/10.11/README.md

@@ -22,8 +22,8 @@ Verification commands
 Run the following commands to validate things are rolling as they should.
 
 ```bash
-# Should use 10.11.9 as the default version
-lando ssh -s defaults -c "mariadb -V | grep 10.11.9"
+# Should use 10.11.11 as the default version
+lando ssh -s defaults -c "mariadb -V | grep 10.11.11"
 
 # Should use the patch version when set by the user
 lando ssh -s patch -c "mariadb -V | grep 10.11.7"

examples/10.5/README.md

@@ -22,8 +22,8 @@ Verification commands
 Run the following commands to validate things are rolling as they should.
 
 ```bash
-# Should use 10.5.25 as the default version
-lando ssh -s defaults -c "mariadb -V | grep 10.5.25"
+# Should use 10.5.27 as the default version
+lando ssh -s defaults -c "mariadb -V | grep 10.5.27"
 
 # Should use the patch version when set by the user
 lando ssh -s patch -c "mariadb -V | grep 10.5.13"

examples/10.6/README.md

@@ -22,8 +22,8 @@ Verification commands
 Run the following commands to validate things are rolling as they should.
 
 ```bash
-# Should use 10.6.18 as the default version
-lando ssh -s defaults -c "mariadb -V | grep 10.6.18"
+# Should use 10.6.20 as the default version
+lando ssh -s defaults -c "mariadb -V | grep 10.6.20"
 
 # Should use the patch version when set by the user
 lando ssh -s patch -c "mariadb -V | grep 10.6.4"

examples/11.2/README.md

@@ -22,8 +22,8 @@ Verification commands
 Run the following commands to validate things are rolling as they should.
 
 ```bash
-# Should use 11.2.5 as the default version
-lando ssh -s defaults -c "mariadb -V | grep 11.2.5"
+# Should use 11.2.6 as the default version
+lando ssh -s defaults -c "mariadb -V | grep 11.2.6"
 
 # Should use the patch version when set by the user
 lando ssh -s patch -c "mariadb -V | grep 11.2.3"

examples/11.4/.lando.yml

@@ -2,6 +2,8 @@ name: lando-mariadb-114
 services:
   database:
     type: mariadb:11.4
+  patch:
+    type: mariadb:11.4.6
 
 proxy:
   database:

examples/11.4/README.md

@@ -22,8 +22,11 @@ Verification commands
 Run the following commands to validate things are rolling as they should.
 
 ```bash
-# Should use 11.4.3 as the default version
-lando ssh -s database -c "mariadb -V | grep 11.4.3"
+# Should use 11.4.6 as the default version
+lando ssh -s database -c "mariadb -V | grep 11.4.6"
+
+# Should use the patch version when set by the user
+lando ssh -s patch -c "mariadb -V | grep 11.4.6"
 
 # Should use the correct default user pass db
 lando ssh -s database -c "mariadb -umariadb -pmariadb database -e quit"

examples/11.5/.lando.yml

@@ -2,6 +2,8 @@ name: lando-mariadb-115
 services:
   database:
     type: mariadb:11.5
+  patch:
+    type: mariadb:11.5.2
 
 proxy:
   database:

examples/11.5/README.md

@@ -25,6 +25,9 @@ Run the following commands to validate things are rolling as they should.
 # Should use 11.5.2 as the default version
 lando ssh -s database -c "mariadb -V | grep 11.5.2"
 
+# Should use the patch version when set by the user
+lando ssh -s patch -c "mariadb -V | grep 11.5.2"
+
 # Should use the correct default user pass db
 lando ssh -s database -c "mariadb -umariadb -pmariadb database -e quit"
 ```

examples/11.6/.lando.yml

@@ -0,0 +1,16 @@
+name: lando-mariadb-116
+services:
+  database:
+    type: mariadb:11.6
+  patch:
+    type: mariadb:11.6.2
+
+proxy:
+  database:
+    - hostname: db.lndo.site
+      port: 3306
+
+# This is important because it lets lando know to test against the plugin in this repo
+# DO NOT REMOVE THIS!
+plugins:
+  "@lando/mariadb": ../..

examples/11.6/README.md

@@ -0,0 +1,44 @@
+MariaDB Example
+===============
+
+This example exists primarily to test the following documentation:
+
+* [MariaDB Service](https://docs.devwithlando.io/tutorials/mariadb.html)
+
+Start up tests
+--------------
+
+Run the following commands to get up and running with this example.
+
+```bash
+# Should start up successfully
+lando poweroff
+lando start
+```
+
+Verification commands
+---------------------
+
+Run the following commands to validate things are rolling as they should.
+
+```bash
+# Should use 11.6.2 as the default version
+lando ssh -s database -c "mariadb -V | grep 11.6.2"
+
+# Should use the patch version when set by the user
+lando ssh -s patch -c "mariadb -V | grep 11.6.2"
+
+# Should use the correct default user pass db
+lando ssh -s database -c "mariadb -umariadb -pmariadb database -e quit"
+```
+
+Destroy tests
+-------------
+
+Run the following commands to trash this app like nothing ever happened.
+
+```bash
+# Should be destroyed with success
+lando destroy -y
+lando poweroff
+```

examples/11.7/.lando.yml

@@ -0,0 +1,16 @@
+name: lando-mariadb-117
+services:
+  database:
+    type: mariadb:11.7
+  patch:
+    type: mariadb:11.7.2
+
+proxy:
+  database:
+    - hostname: db.lndo.site
+      port: 3306
+
+# This is important because it lets lando know to test against the plugin in this repo
+# DO NOT REMOVE THIS!
+plugins:
+  "@lando/mariadb": ../..

examples/11.7/README.md

@@ -0,0 +1,44 @@
+MariaDB Example
+===============
+
+This example exists primarily to test the following documentation:
+
+* [MariaDB Service](https://docs.devwithlando.io/tutorials/mariadb.html)
+
+Start up tests
+--------------
+
+Run the following commands to get up and running with this example.
+
+```bash
+# Should start up successfully
+lando poweroff
+lando start
+```
+
+Verification commands
+---------------------
+
+Run the following commands to validate things are rolling as they should.
+
+```bash
+# Should use 11.7.2 as the default version
+lando ssh -s database -c "mariadb -V | grep 11.7.2"
+
+# Should use the patch version when set by the user
+lando ssh -s patch -c "mariadb -V | grep 11.7.2"
+
+# Should use the correct default user pass db
+lando ssh -s database -c "mariadb -umariadb -pmariadb database -e quit"
+```
+
+Destroy tests
+-------------
+
+Run the following commands to trash this app like nothing ever happened.
+
+```bash
+# Should be destroyed with success
+lando destroy -y
+lando poweroff
+```