Skip to content

Commit

Permalink
Bump MariaDB versions (#56)
Browse files Browse the repository at this point in the history
* Bump versions to latest Bitnami offered ones

* Bump default version numbers and use mariadb binary, where available

* Update changelog

* 11.3 isn't legacy

* While waiting for merge, 11.0 was EOL'd
  • Loading branch information
todeveni authored Jun 11, 2024
1 parent b9b600f commit 223a531
Show file tree
Hide file tree
Showing 16 changed files with 63 additions and 58 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})

* Bumped all available MariaDB minor versions. [#56](https://github.com/lando/mariadb/pull/56)

## v1.3.0 - [April 11, 2024](https://github.com/lando/mariadb/releases/tag/v1.3.0)

* Updated available version of Mariadb to 11.3. [#53](https://github.com/lando/mariadb/pull/53)
Expand Down
23 changes: 12 additions & 11 deletions builders/mariadb.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,23 @@ module.exports = {
version: '10.3',
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'],
legacy: ['11.0', '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',
'10.11': 'bitnami/mariadb:10.11.7-debian-12-r6',
'11.3': 'bitnami/mariadb:11.3.2-debian-12-r5',
'11.2': 'bitnami/mariadb:11.2.4-debian-12-r0',
'11.1': 'bitnami/mariadb:11.1.5-debian-12-r0',
'11.0': 'bitnami/mariadb:11.0.6-debian-12-r0',
'10.11': 'bitnami/mariadb:10.11.8-debian-12-r0',
'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',
'10.3': 'bitnami/mariadb:10.3.27-debian-10-r84',
'10.2': 'bitnami/mariadb:10.2.36-debian-10-r83',
'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.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',
},
patchesSupported: true,
Expand Down
6 changes: 3 additions & 3 deletions examples/10.10/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ 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"
lando ssh -s defaults -c "mariadb -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"
lando ssh -s patch -c "mariadb -V | grep 10.10.7"

# Should use the correct default user pass db
lando ssh -s defaults -c "mysql -umariadb -pmariadb database -e quit"
lando ssh -s defaults -c "mariadb -umariadb -pmariadb database -e quit"
```

Destroy tests
Expand Down
8 changes: 4 additions & 4 deletions examples/10.11/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ 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 10.11.8 as the default version
lando ssh -s defaults -c "mariadb -V | grep 10.11.8"

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

# Should use the correct default user pass db
lando ssh -s defaults -c "mysql -umariadb -pmariadb database -e quit"
lando ssh -s defaults -c "mariadb -umariadb -pmariadb database -e quit"
```

Destroy tests
Expand Down
4 changes: 2 additions & 2 deletions examples/10.2/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ Verification commands
Run the following commands to validate things are rolling as they should.

```bash
# Should use 10.2.36 as the default version
lando ssh -s defaults -c "mysql -V | grep 10.2.36"
# Should use 10.2.44 as the default version
lando ssh -s defaults -c "mysql -V | grep 10.2.44"

# Should use the patch version when set by the user
lando ssh -s patch -c "mysql -V | grep 10.2.40"
Expand Down
4 changes: 2 additions & 2 deletions examples/10.3/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ Verification commands
Run the following commands to validate things are rolling as they should.

```bash
# Should use 10.3.27 as the default version
lando ssh -s defaults -c "mysql -V | grep 10.3.27"
# Should use 10.3.39 as the default version
lando ssh -s defaults -c "mysql -V | grep 10.3.39"

# Should use the patch version when set by the user
lando ssh -s patch -c "mysql -V | grep 10.3.32"
Expand Down
8 changes: 4 additions & 4 deletions examples/10.4/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ Verification commands
Run the following commands to validate things are rolling as they should.

```bash
# Should use 10.4.17 as the default version
lando ssh -s defaults -c "mysql -V | grep 10.4.17"
# Should use 10.4.34 as the default version
lando ssh -s defaults -c "mariadb -V | grep 10.4.34"

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

# Should use the correct default user pass db
lando ssh -s defaults -c "mysql -umariadb -pmariadb database -e quit"
lando ssh -s defaults -c "mariadb -umariadb -pmariadb database -e quit"
```

Destroy tests
Expand Down
8 changes: 4 additions & 4 deletions examples/10.5/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ Verification commands
Run the following commands to validate things are rolling as they should.

```bash
# Should use 10.5.8 as the default version
lando ssh -s defaults -c "mysql -V | grep 10.5.8"
# Should use 10.5.25 as the default version
lando ssh -s defaults -c "mariadb -V | grep 10.5.25"

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

# Should use the correct default user pass db
lando ssh -s defaults -c "mysql -umariadb -pmariadb database -e quit"
lando ssh -s defaults -c "mariadb -umariadb -pmariadb database -e quit"
```

Destroy tests
Expand Down
8 changes: 4 additions & 4 deletions examples/10.6/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ Verification commands
Run the following commands to validate things are rolling as they should.

```bash
# Should use 10.5.8 as the default version
lando ssh -s defaults -c "mysql -V | grep 10.6.5"
# Should use 10.6.18 as the default version
lando ssh -s defaults -c "mariadb -V | grep 10.6.18"

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

# Should use the correct default user pass db
lando ssh -s defaults -c "mysql -umariadb -pmariadb database -e quit"
lando ssh -s defaults -c "mariadb -umariadb -pmariadb database -e quit"
```

Destroy tests
Expand Down
6 changes: 3 additions & 3 deletions examples/10.7/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ 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"
lando ssh -s defaults -c "mariadb -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"
lando ssh -s patch -c "mariadb -V | grep 10.7.8"

# Should use the correct default user pass db
lando ssh -s defaults -c "mysql -umariadb -pmariadb database -e quit"
lando ssh -s defaults -c "mariadb -umariadb -pmariadb database -e quit"
```

Destroy tests
Expand Down
6 changes: 3 additions & 3 deletions examples/10.8/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ 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"
lando ssh -s defaults -c "mariadb -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"
lando ssh -s patch -c "mariadb -V | grep 10.8.8"

# Should use the correct default user pass db
lando ssh -s defaults -c "mysql -umariadb -pmariadb database -e quit"
lando ssh -s defaults -c "mariadb -umariadb -pmariadb database -e quit"
```

Destroy tests
Expand Down
6 changes: 3 additions & 3 deletions examples/10.9/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ 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"
lando ssh -s defaults -c "mariadb -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"
lando ssh -s patch -c "mariadb -V | grep 10.9.8"

# Should use the correct default user pass db
lando ssh -s defaults -c "mysql -umariadb -pmariadb database -e quit"
lando ssh -s defaults -c "mariadb -umariadb -pmariadb database -e quit"
```

Destroy tests
Expand Down
8 changes: 4 additions & 4 deletions examples/11.0/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ Verification commands
Run the following commands to validate things are rolling as they should.

```bash
# Should use 11.0.5 as the default version
lando ssh -s defaults -c "mysql -V | grep 11.0.5"
# Should use 11.0.6 as the default version
lando ssh -s defaults -c "mariadb -V | grep 11.0.6"

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

# Should use the correct default user pass db
lando ssh -s defaults -c "mysql -umariadb -pmariadb database -e quit"
lando ssh -s defaults -c "mariadb -umariadb -pmariadb database -e quit"
```

Destroy tests
Expand Down
8 changes: 4 additions & 4 deletions examples/11.1/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ Verification commands
Run the following commands to validate things are rolling as they should.

```bash
# Should use 11.1.4 as the default version
lando ssh -s defaults -c "mysql -V | grep 11.1.4"
# Should use 11.1.5 as the default version
lando ssh -s defaults -c "mariadb -V | grep 11.1.5"

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

# Should use the correct default user pass db
lando ssh -s defaults -c "mysql -umariadb -pmariadb database -e quit"
lando ssh -s defaults -c "mariadb -umariadb -pmariadb database -e quit"
```

Destroy tests
Expand Down
8 changes: 4 additions & 4 deletions examples/11.2/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ Verification commands
Run the following commands to validate things are rolling as they should.

```bash
# Should use 11.2.3 as the default version
lando ssh -s defaults -c "mysql -V | grep 11.2.3"
# Should use 11.2.4 as the default version
lando ssh -s defaults -c "mariadb -V | grep 11.2.4"

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

# Should use the correct default user pass db
lando ssh -s defaults -c "mysql -umariadb -pmariadb database -e quit"
lando ssh -s defaults -c "mariadb -umariadb -pmariadb database -e quit"
```

Destroy tests
Expand Down
6 changes: 3 additions & 3 deletions examples/11.3/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ 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"
lando ssh -s defaults -c "mariadb -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"
lando ssh -s patch -c "mariadb -V | grep 11.3.2"

# Should use the correct default user pass db
lando ssh -s defaults -c "mysql -umariadb -pmariadb database -e quit"
lando ssh -s defaults -c "mariadb -umariadb -pmariadb database -e quit"
```

Destroy tests
Expand Down

0 comments on commit 223a531

Please sign in to comment.