Merge branch 'main' into update-dbs

.github/workflows/pr-mariadb-tests.yml

@@ -24,6 +24,14 @@ jobs:
           - examples/10.4
           - examples/10.5
           - examples/10.6
+          - examples/10.7
+          - examples/10.8
+          - examples/10.9
+          - examples/10.10
+          - examples/10.11
+          - examples/11.0
+          - examples/11.1
+          - examples/11.2
           - examples/custom
     steps:
       - name: Checkout code

CHANGELOG.md

@@ -1,5 +1,11 @@
+## v1.2.0 - [March 19, 2024](https://github.com/lando/mariadb/releases/tag/v1.2.0)
+
+* Updated default DB versions. [#45](https://github.com/lando/mariadb/pull/45)
+
 ## v1.1.0 - [March 8, 2024](https://github.com/lando/mariadb/releases/tag/v1.1.0)
-  * Updated to latest database services.
+
+### Fixes
+* Allow empty password and other creds fields to pass healthcheck [lando/lamp#51](https://github.com/lando/lamp/issues/51)
 
 ## v1.0.0 - [December 7, 2023](https://github.com/lando/mariadb/releases/tag/v1.0.0)
 

builders/mariadb.js

@@ -9,9 +9,18 @@ module.exports = {
   name: 'mariadb',
   config: {
     version: '10.3',
-    supported: ['10.6', '10.5', '10.4', '10.3', '10.2', '10.1'],
-    legacy: ['10.1'],
+    supported: ['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: ['10.10', '10.9', '10.8', '10.7', '10.3', '10.2', '10.1'],
     pinPairs: {
+      '11.2': 'bitnami/mariadb:11.2.3-debian-12-r4',
+      '11.1': 'bitnami/mariadb:11.1.4-debian-12-r4',
+      '11.0': 'bitnami/mariadb:11.0.5-debian-12-r5',
+      '10.11': 'bitnami/mariadb:10.11.7-debian-12-r6',
+      '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.5-debian-10-r30',
       '10.5': 'bitnami/mariadb:10.5.8-debian-10-r74',
       '10.4': 'bitnami/mariadb:10.4.17-debian-10-r84',

docs/index.md

@@ -18,11 +18,15 @@ services:
 
 ## Supported versions
 
+*   [11.3](https://hub.docker.com/r/bitnami/mariadb)
+*   [11.2](https://hub.docker.com/r/bitnami/mariadb)
+*   [11.1](https://hub.docker.com/r/bitnami/mariadb)
+*   [11.0](https://hub.docker.com/r/bitnami/mariadb)
+*   [10.11](https://hub.docker.com/r/bitnami/mariadb)
 *   [10.6](https://hub.docker.com/r/bitnami/mariadb)
 *   [10.5](https://hub.docker.com/r/bitnami/mariadb)
 *   [10.4](https://hub.docker.com/r/bitnami/mariadb)
 *   **[10.3](https://hub.docker.com/r/bitnami/mariadb)** **(default)**
-*   [10.2](https://hub.docker.com/r/bitnami/mariadb)
 *   [custom](https://docs.lando.dev/core/v3/lando-service.html#overrides)
 
 ## Legacy versions
@@ -33,6 +37,11 @@ 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).
 
+*   [10.10](https://hub.docker.com/r/bitnami/mariadb)
+*   [10.9](https://hub.docker.com/r/bitnami/mariadb)
+*   [10.8](https://hub.docker.com/r/bitnami/mariadb)
+*   [10.7](https://hub.docker.com/r/bitnami/mariadb)
+*   [10.2](https://hub.docker.com/r/bitnami/mariadb)
 *   [10.1](https://hub.docker.com/r/bitnami/mariadb)
 
 ## Patch versions

examples/10.10/.lando.yml

@@ -0,0 +1,14 @@
+name: lando-mariadb-1010
+services:
+  defaults:
+    type: mariadb:10.10
+  patch:
+    type: mariadb:10.10.7
+proxy:
+  defaults:
+    - 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/10.10/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 10.10.7 as the default version
+lando ssh -s defaults -c "mysql -V | grep 10.10.7"
+
+# Should use the patch version when set by the user
+lando ssh -s patch -c "mysql -V | grep 10.10.7"
+
+# Should use the correct default user pass db
+lando ssh -s defaults -c "mysql -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/10.11/.lando.yml

@@ -0,0 +1,14 @@
+name: lando-mariadb-1011
+services:
+  defaults:
+    type: mariadb:10.11
+  patch:
+    type: mariadb:10.11.7
+proxy:
+  defaults:
+    - 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/10.11/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 10.11.7 as the default version
+lando ssh -s defaults -c "mysql -V | grep 10.11.7"
+
+# Should use the patch version when set by the user
+lando ssh -s patch -c "mysql -V | grep 10.11.7"
+
+# Should use the correct default user pass db
+lando ssh -s defaults -c "mysql -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/10.7/.lando.yml

@@ -0,0 +1,14 @@
+name: lando-mariadb-107
+services:
+  defaults:
+    type: mariadb:10.7
+  patch:
+    type: mariadb:10.7.8
+proxy:
+  defaults:
+    - 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/10.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 10.7.8 as the default version
+lando ssh -s defaults -c "mysql -V | grep 10.7.8"
+
+# Should use the patch version when set by the user
+lando ssh -s patch -c "mysql -V | grep 10.7.8"
+
+# Should use the correct default user pass db
+lando ssh -s defaults -c "mysql -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/10.8/.lando.yml

@@ -0,0 +1,14 @@
+name: lando-mariadb-108
+services:
+  defaults:
+    type: mariadb:10.8
+  patch:
+    type: mariadb:10.8.8
+proxy:
+  defaults:
+    - 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/10.8/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 10.8.8 as the default version
+lando ssh -s defaults -c "mysql -V | grep 10.8.8"
+
+# Should use the patch version when set by the user
+lando ssh -s patch -c "mysql -V | grep 10.8.8"
+
+# Should use the correct default user pass db
+lando ssh -s defaults -c "mysql -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/10.9/.lando.yml

@@ -0,0 +1,14 @@
+name: lando-mariadb-109
+services:
+  defaults:
+    type: mariadb:10.9
+  patch:
+    type: mariadb:10.9.8
+proxy:
+  defaults:
+    - 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/10.9/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 10.9.8 as the default version
+lando ssh -s defaults -c "mysql -V | grep 10.9.8"
+
+# Should use the patch version when set by the user
+lando ssh -s patch -c "mysql -V | grep 10.9.8"
+
+# Should use the correct default user pass db
+lando ssh -s defaults -c "mysql -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.0/.lando.yml

@@ -0,0 +1,14 @@
+name: lando-mariadb-110
+services:
+  defaults:
+    type: mariadb:11.0
+  patch:
+    type: mariadb:11.0.5
+proxy:
+  defaults:
+    - 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": ../..