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

Fix docker stuff for new mariadb:lts #37659

Merged
merged 1 commit into from
May 31, 2024
Merged

Conversation

anomiex
Copy link
Contributor

@anomiex anomiex commented May 31, 2024

Proposed changes:

It seems that MariaDB released a new lts, which dropped a bunch of the compatibility mysql-named symlinks from their docker image. This broke a bunch of our stuff.

  • Change the health command passed to Docker.
  • Use new names in the dev env db upgrade wrapper script.
  • Pass the correct command to the dev env DB container.

Also I noticed our tests workflow was still using MySQL 5.6, while WordPress now requires either MySQL 8.0+ or MariaDB 10.4+. Updated to the latter there too.

Other information:

  • Have you written new tests for your changes, if applicable?
  • Have you checked the E2E test CI results, and verified that your changes do not break them?
  • Have you tested your changes on WordPress.com, if applicable (if so, you'll see a generated comment below with a script to run)?

Jetpack product discussion

p1717161929313609/1717160529.942769-slack-C034JEXD1RD

Does this pull request change what data or activity we track or use?

No

Testing instructions:

It seems that MariaDB released a new lts, which dropped a bunch of the
compatibility mysql-named symlinks from their docker image. This broke a
bunch of our stuff.

* Change the health command passed to Docker.
* Use new names in the dev env db upgrade wrapper script.
* Pass the correct `command` to the dev env DB container.

Also I noticed our tests workflow was still using MySQL 5.6, while
WordPress now requires either MySQL 8.0+ or MariaDB 10.4+. Updated to
the latter there too.
@anomiex anomiex added [Type] Bug When a feature is broken and / or not performing as intended [Status] Needs Review To request a review from Crew. Label will be renamed soon. [Pri] BLOCKER labels May 31, 2024
@anomiex anomiex requested a review from a team May 31, 2024 14:16
@anomiex anomiex self-assigned this May 31, 2024
@github-actions github-actions bot added Actions GitHub actions used to automate some of the work around releases and repository management Docker labels May 31, 2024
Copy link
Contributor

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

  • ✅ Include a description of your PR changes.
  • ✅ Add a "[Status]" label (In Progress, Needs Team Review, ...).
  • ✅ Add testing instructions.
  • ✅ Specify whether this PR includes any changes to data or privacy.
  • ✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖


The e2e test report can be found here. Please note that it can take a few minutes after the e2e tests checks are complete for the report to be available.


Once your PR is ready for review, check one last time that all required checks appearing at the bottom of this PR are passing or skipped.
Then, add the "[Status] Needs Team Review" label and ask someone from your team review the code. Once reviewed, it can then be merged.
If you need an extra review from someone familiar with the codebase, you can update the labels from "[Status] Needs Team Review" to "[Status] Needs Review", and in that case Jetpack Approvers will do a final review of your PR.

@anomiex anomiex enabled auto-merge (squash) May 31, 2024 14:25
@@ -198,7 +198,7 @@ jobs:
MARIADB_ROOT_PASSWORD: wordpress
ports:
- 3306:3306
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=5
options: --health-cmd="healthcheck.sh --su-mysql --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=5
Copy link
Contributor

Choose a reason for hiding this comment

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

Why --su-mysql?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copied from the first example at https://mariadb.com/kb/en/using-healthcheck-sh/#examples, since it seemed to work.

@anomiex anomiex merged commit 4bde2c4 into trunk May 31, 2024
56 checks passed
@anomiex anomiex deleted the fix/mariadb-lts-docker-stuff branch May 31, 2024 14:55
@github-actions github-actions bot removed the [Status] Needs Review To request a review from Crew. Label will be renamed soon. label May 31, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Actions GitHub actions used to automate some of the work around releases and repository management Docker [Pri] BLOCKER [Type] Bug When a feature is broken and / or not performing as intended
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants