Update MariaDB image to 10.6 for integration tests and dev services #23329
Conversation
quarkus-bot
bot
added
area/dependencies
| @@ -23,7 +23,7 @@ public static String guessDialect(String persistenceUnitName, String resolvedDbK | |||
| return "io.quarkus.hibernate.orm.runtime.dialect.QuarkusH2Dialect"; | |||
| } | |||
| if (DatabaseKind.isMariaDB(resolvedDbKind)) { | |||
| return "org.hibernate.dialect.MariaDB103Dialect"; | |||
| return "org.hibernate.dialect.MariaDB106Dialect"; | |||
There was a problem hiding this comment.
Not entirely sure about this one. But to quote the comment further up:
// For now select the latest dialect from the driver
If it's get's merged like this we should probably add something to the migration guide? 🤔
There was a problem hiding this comment.
Agreed on the change and the note.
There was a problem hiding this comment.
| .parse(imageName.orElse("docker.io/" + MariaDBContainer.IMAGE + ":" + MariaDBDevServicesProcessor.TAG)) | ||
| .asCompatibleSubstituteFor(DockerImageName.parse(MariaDBContainer.IMAGE))); | ||
| .parse(imageName.orElseGet(() -> ConfigureUtil.getDefaultImageNameFor("mariadb"))) | ||
| .asCompatibleSubstituteFor(DockerImageName.parse(MariaDBContainer.NAME))); |
There was a problem hiding this comment.
Note: IMAGE is deprecated.
|
|
||
| static { | ||
| var tccl = Thread.currentThread().getContextClassLoader(); | ||
| try (InputStream in = tccl.getResourceAsStream("devservices.properties")) { |
There was a problem hiding this comment.
Not sure about "external" dev services. To cover those as well here we could load all properties on the CP.
But then again this can be considered more of an "internal" feature for the beginning?
| @@ -0,0 +1 @@ | |||
| mariadb.image=${mariadb.image} | |||
There was a problem hiding this comment.
So you would have one common file for all the images, right?
I thought of doing it with a file specific to each devservice but it's certainly easier this way and good enough IMHO. This could be generalized to all devservices next.
There was a problem hiding this comment.
@gsmet Yeah, thought about multiple files too. I can change it to a specific one per dev service if you prefer.
This would make loading that specific file a bit more complicated though, but it's definitely doable.
There was a problem hiding this comment.
PS: This would also make #23329 (comment) obsolete.
There was a problem hiding this comment.
FWIW:
This could be generalized to all devservices next.
I have started working on this.
| @@ -23,7 +23,7 @@ public static String guessDialect(String persistenceUnitName, String resolvedDbK | |||
| return "io.quarkus.hibernate.orm.runtime.dialect.QuarkusH2Dialect"; | |||
| } | |||
| if (DatabaseKind.isMariaDB(resolvedDbKind)) { | |||
| return "org.hibernate.dialect.MariaDB103Dialect"; | |||
| return "org.hibernate.dialect.MariaDB106Dialect"; | |||
There was a problem hiding this comment.
Agreed on the change and the note.
|
Nice! |
Came up here: #23249 (comment)
From a recent poll (ongoing): https://mariadb.org/poll/server-version-with-10-6/
/cc @Sanne
I also came up with a way to keep the respective dev service aligned by using what was moved to
build-parentnot long ago.If you guys like it I can adjust the other dev services in a separate PR.