chore: Switch to libmariadb-dev #1635
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghagl
force-pushed
the
master
branch
2 times, most recently
from
ff8a17c to
4205542
Compare
jrconlin
approved these changes
Dec 4, 2024
pjenvey
requested changes
Dec 11, 2024
| apt-get -q update && \ | ||
| apt-get -q install -y --no-install-recommends libmysqlclient-dev cmake | ||
| apt-get -q install -y --no-install-recommends libmariadb-dev-compat libmariadb-dev cmake |
There was a problem hiding this comment.
nit: libmariadb-dev is superfluous w/ libmariadb-dev-compat (which depends on it)
| @@ -11,12 +11,10 @@ ARG DATABASE_BACKEND=spanner | |||
|
|
|||
| # cmake is required to build grpcio-sys for Spanner builds | |||
| RUN \ | |||
| # Fetch and load the MySQL public key. We need to install libmysqlclient-dev to build syncstorage-rs | |||
| # We need to install libmariadb-dev to build syncstorage-rs | |||
There was a problem hiding this comment.
you can kill this comment entirely
| @@ -65,16 +56,9 @@ RUN \ | |||
| RUN \ | |||
| groupadd --gid 10001 app && \ | |||
| useradd --uid 10001 --gid 10001 --home /app --create-home app && \ | |||
| # first, an apt-get update is required for gnupg, which is required for apt-key adv | |||
| # first, an apt-get update is required for the packages | |||
There was a problem hiding this comment.
please kill this comment entirely as well (it was explaining the previous need for calling apt-get update twice here)
|
(For reference: where we originally moved away from maria's client: #1435 ) |
|
Oh, I just realized I'm doing similar work. I have a branch that upgrades to Diesel 2.x, which uses mysqlclient-sys 0.4.0, which supports finding libmariadb-dev without -compat. I retained the libmysqlclient code as a build arg option. |
|
Is this PR now redundant by other changes that have already been made upstream? |
pjenvey
added a commit
that referenced
this pull request
Mar 21, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
The MySQL repository causes issues when trying to build for other architectures (non-existent MySQL binaries), therefore the MariaDB packages should instead be used. This has been successfully tested on arm64.
Testing
Build on all relevant architectures (x86, arm64, ...).