Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MariaDB 11 support #698

Merged
merged 9 commits into from
Jun 18, 2024
Merged

MariaDB 11 support #698

merged 9 commits into from
Jun 18, 2024

Conversation

tomcoonen
Copy link
Contributor

Since MariaDB 11 differentiates more from MySQL, and to still support v10 I've split them up.
While upgrading an app you might need to switch back, and removing the MariaDB volume is extra work. By naming the volumes differently you have no issues there.

@taylorotwell
Copy link
Member

So how would the maria11.stub actually get into the user's docker-compose.yml file?

@taylorotwell taylorotwell marked this pull request as draft June 13, 2024 13:41
@taylorotwell taylorotwell marked this pull request as ready for review June 13, 2024 13:41
@tomcoonen
Copy link
Contributor Author

@taylorotwell If you're ok with the approach, I can add the rest of the code?
Not sure if we should keep 'mariadb' or change it to 'mariadb10'?

@taylorotwell
Copy link
Member

It could potentially be kept separate from Maria 10.

@taylorotwell taylorotwell marked this pull request as draft June 14, 2024 01:37
@tomcoonen
Copy link
Contributor Author

@taylorotwell Made the rest of the changes, tried to keep as much as possible in line with what is already there.

@driesvints driesvints marked this pull request as ready for review June 17, 2024 07:03
@driesvints
Copy link
Member

@tomcoonen don't forget to mark the PR back to ready if you need a review 😉

Copy link
Contributor

@Jubeki Jubeki left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the docker-compose.yaml (the stubs in this case), I would also use mariadb instead of mariadb10/mariadb11 because this is also the host which will configured in the .env

Your normally also only have on database. We also only use the name mysql for MySQL 8 and not mysql8.

stubs/mariadb10.stub Outdated Show resolved Hide resolved
stubs/mariadb11.stub Outdated Show resolved Hide resolved
stubs/mariadb11.stub Outdated Show resolved Hide resolved
stubs/mariadb10.stub Outdated Show resolved Hide resolved
taylorotwell and others added 4 commits June 18, 2024 12:34
Co-authored-by: Julius Kiekbusch <[email protected]>
Co-authored-by: Julius Kiekbusch <[email protected]>
Co-authored-by: Julius Kiekbusch <[email protected]>
Co-authored-by: Julius Kiekbusch <[email protected]>
@taylorotwell taylorotwell merged commit e08b594 into laravel:1.x Jun 18, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants