Skip to content

Commit

Permalink
Update available version of Mariadb to 11.3 (#53)
Browse files Browse the repository at this point in the history
* Update available version of Mariadb to 11.3

* Restore package(-lock).json

* Add newlines to the end of package(-lock).json to fix lint issue

* Regenerate package-lock.json.

* Add newline at eof in config.mjs.

* Bump date in CHANGELOG.md

---------

Co-authored-by: Alec Reynolds <alec+git@lando.dev>
  • Loading branch information
uberhacker and reynoldsalec authored Apr 11, 2024
1 parent e8e5d1f commit c41dee6
Show file tree
Hide file tree
Showing 11 changed files with 304 additions and 316 deletions.
1 change: 1 addition & 0 deletions .github/workflows/pr-mariadb-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ jobs:
- examples/11.0
- examples/11.1
- examples/11.2
- examples/11.3
- examples/custom
steps:
- name: Checkout code
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## v1.3.0 - [April 11, 2024](https://github.com/lando/mariadb/releases/tag/v1.3.0)

* Update available version of Mariadb to 11.3. [#51](https://github.com/lando/mariadb/issues/51)

## v1.2.0 - [March 19, 2024](https://github.com/lando/mariadb/releases/tag/v1.2.0)

* Updated available version of Mariadb. [#45](https://github.com/lando/mariadb/pull/45)
Expand Down
5 changes: 3 additions & 2 deletions builders/mariadb.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@ module.exports = {
name: 'mariadb',
config: {
version: '10.3',
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'],
supported: ['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: ['10.10', '10.9', '10.8', '10.7', '10.3', '10.2', '10.1'],
pinPairs: {
'11.3': 'bitnami/mariadb:11.3.2-debian-12-r1',
'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',
Expand Down
2 changes: 1 addition & 1 deletion docs/.vitepress/config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ function sidebar() {
],
},
];
};
};
29 changes: 15 additions & 14 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,15 @@ services:
## Supported versions
* [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)**
* [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/lando-service.html#overrides)
## Legacy versions
Expand All @@ -36,12 +37,12 @@ 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)
* [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.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.)
## Patch versions
Expand Down
2 changes: 1 addition & 1 deletion docs/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ lando plugin-add @lando/mariadb
```

```sh [hyperdrive]
# @NOTE: This doesn't actaully work yet
# @NOTE: This doesn't actually work yet
hyperdrive install @lando/mariadb
```

Expand Down
4 changes: 2 additions & 2 deletions docs/support.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: Get help and support for the Lando Mariadb Plugin

# Contact Us

If you need priority and dedicated support, expediated bug fixes or more features then please contact us below.
If you need priority and dedicated support, expedited bug fixes or more features then please contact us below.

<form class="netlify" name="contact" method="POST" netflify data-netlify="true">
<input type="hidden" name="form-name" value="contact" />
Expand All @@ -21,4 +21,4 @@ If you need priority and dedicated support, expediated bug fixes or more feature
<p>
<button type="submit">Submit</button>
</p>
</form>
</form>
14 changes: 14 additions & 0 deletions examples/11.3/.lando.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: lando-mariadb-113
services:
defaults:
type: mariadb:11.3
patch:
type: mariadb:11.3.2
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": ../..
44 changes: 44 additions & 0 deletions examples/11.3/README.md
Original file line number Diff line number Diff line change
@@ -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.3.2 as the default version
lando ssh -s defaults -c "mysql -V | grep 11.3.2"

# Should use the patch version when set by the user
lando ssh -s patch -c "mysql -V | grep 11.3.2"

# 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
```
Loading

0 comments on commit c41dee6

Please sign in to comment.