Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
services:
db:
platform: linux/amd64
image: mcr.microsoft.com/mssql/server:2025-latest
environment:
ACCEPT_EULA: Y
MSSQL_PID: Developer
MSSQL_SA_PASSWORD: OieSqlServerPassw0rd!
healthcheck:
test:
- CMD-SHELL
- /opt/mssql-tools18/bin/sqlcmd -C -S 127.0.0.1 -U sa -P "$$MSSQL_SA_PASSWORD" -Q "SELECT 1" || /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U sa -P "$$MSSQL_SA_PASSWORD" -Q "SELECT 1"
interval: 3s
timeout: 5s
retries: 30
start_period: 30s

db-init:
platform: linux/amd64
image: mcr.microsoft.com/mssql/server:2025-latest
depends_on:
db:
condition: service_healthy
environment:
MSSQL_SA_PASSWORD: OieSqlServerPassw0rd!
restart: "no"
entrypoint:
- /bin/bash
- -lc
- /opt/mssql-tools18/bin/sqlcmd -C -S db -U sa -P "$$MSSQL_SA_PASSWORD" -Q "IF DB_ID('mirthdb') IS NULL CREATE DATABASE mirthdb;" || /opt/mssql-tools/bin/sqlcmd -S db -U sa -P "$$MSSQL_SA_PASSWORD" -Q "IF DB_ID('mirthdb') IS NULL CREATE DATABASE mirthdb;"

oie:
image: ${OIE_IMAGE}
depends_on:
db-init:
condition: service_completed_successfully
environment:
DATABASE: sqlserver
DATABASE_URL: jdbc:sqlserver://db:1433;databaseName=mirthdb;encrypt=true;trustServerCertificate=true
_MP_DATABASE_DRIVER: com.microsoft.sqlserver.jdbc.SQLServerDriver
Comment on lines +39 to +40

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can we change the existing smoke test and drop support for the old one instead? I don't think we need multiple for this.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

This is what I put in the PR description about that change

The existing jTDS configuration moves from SQL Server 2025 to 2022. 2022 is still widely deployed, and this keeps jTDS covered while it heads toward deprecation.

jTDS is still the default driver, so I didn't want to remove it from the smoke tests yet, but I figured it would get phased out eventually. Would you prefer I drop it from the smoke test now? I at least made it so each driver was running against a different version of SQL Server.

DATABASE_USERNAME: sa
DATABASE_PASSWORD: OieSqlServerPassw0rd!
DATABASE_MAX_CONNECTIONS: 20
DATABASE_MAX_RETRY: 20
DATABASE_RETRY_WAIT: 5000
ports:
- "8443:8443"
healthcheck:
test:
- CMD-SHELL
- bash -lc 'exec 3<>/dev/tcp/127.0.0.1/8443'
interval: 3s
timeout: 5s
retries: 30
start_period: 40s

# Lets the Database Connector metadata test reach this configuration's database. The URL is
# resolved by the oie service, not the harness, so it is the same one the engine uses.
harness:
environment:
OIE_DB_DRIVER: com.microsoft.sqlserver.jdbc.SQLServerDriver
OIE_DB_URL: jdbc:sqlserver://db:1433;databaseName=mirthdb;encrypt=true;trustServerCertificate=true
OIE_DB_USERNAME: sa
OIE_DB_PASSWORD: OieSqlServerPassw0rd!
4 changes: 2 additions & 2 deletions ci/configurations/alpine-temurin21-sqlserver.compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
services:
db:
platform: linux/amd64
image: mcr.microsoft.com/mssql/server:2025-latest
image: mcr.microsoft.com/mssql/server:2022-latest
environment:
ACCEPT_EULA: Y
MSSQL_PID: Developer
Expand All @@ -17,7 +17,7 @@ services:

db-init:
platform: linux/amd64
image: mcr.microsoft.com/mssql/server:2025-latest
image: mcr.microsoft.com/mssql/server:2022-latest
depends_on:
db:
condition: service_healthy
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ miglayout-swing = { module = "com.miglayout:miglayout-swing", version.ref = "mig
mimepull = { module = "org.jvnet.mimepull:mimepull", version = "1.9.7" }
mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
mockito-inline = { module = "org.mockito:mockito-inline", version.ref = "mockito" }
mssql-jdbc = { module = "com.microsoft.sqlserver:mssql-jdbc", version = "10.2.4.jre11" }
mssql-jdbc = { module = "com.microsoft.sqlserver:mssql-jdbc", version = "13.6.2.jre11" }
mybatis = { module = "org.mybatis:mybatis", version = "3.1.1" }
mysql-connector-j = { module = "com.mysql:mysql-connector-j", version = "8.4.0" }
netty-buffer = { module = "io.netty:netty-buffer", version.ref = "netty" }
Expand Down
10 changes: 5 additions & 5 deletions gradle/verification-metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -485,12 +485,12 @@
<sha256 value="1d7c4183875d72b039dca6428eab30afeeb8449a84bf2f9c2cbc8e499951107e" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.microsoft.sqlserver" name="mssql-jdbc" version="10.2.4.jre11">
<artifact name="mssql-jdbc-10.2.4.jre11.jar">
<sha256 value="4040a1b830fcd29eac46b43001e2ffa8c788e8a78738737db5b78b05a1de43b2" origin="Generated by Gradle"/>
<component group="com.microsoft.sqlserver" name="mssql-jdbc" version="13.6.2.jre11">
<artifact name="mssql-jdbc-13.6.2.jre11.jar">
<sha256 value="5fbc0a70fe4d1d563d431a41b23f493d68807571f0bb49db0bb1737e83e9161f" origin="Generated by Gradle"/>
</artifact>
<artifact name="mssql-jdbc-10.2.4.jre11.pom">
<sha256 value="1879c353d3fb0893c79fc2a9617fa15a0426947c6c821d8b877acc36debc7f71" origin="Generated by Gradle"/>
<artifact name="mssql-jdbc-13.6.2.jre11.pom">
<sha256 value="32bf222ed2e137a2dfdc32d87ac9556ace966784c4c2c37b2cce87d3984be468" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.miglayout" name="miglayout-core" version="4.2">
Expand Down
Loading