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.

Sign up for GitHub

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

ci: update mssql server image #2446

Merged
merged 7 commits into from
Sep 23, 2024
Merged

ci: update mssql server image #2446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
473c773
ci: update mssql server image
pichlermarc Sep 23, 2024
5b98b79
chore: update healthcheck command
pichlermarc Sep 23, 2024
bac0962
chore: update healthcheck command
pichlermarc Sep 23, 2024
e11308c
chore: update healthcheck command path
pichlermarc Sep 23, 2024
c309dcf
chore: ignore self-signed cert
pichlermarc Sep 23, 2024
04c9080
chore: go straight to mssql server 2022
pichlermarc Sep 23, 2024
9e329e6
bump the mssql/server version used in contrib-test-utils 'startDocker…
trentm Sep 23, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/test-all-versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ jobs:
ports:
- 27017:27017
mssql:
image: mcr.microsoft.com/mssql/server:2017-latest
image: mcr.microsoft.com/mssql/server:2022-latest
env:
SA_PASSWORD: mssql_passw0rd
ACCEPT_EULA: Y
ports:
- 1433:1433
options: >-
--health-cmd "/opt/mssql-tools/bin/sqlcmd -U sa -P $SA_PASSWORD -Q 'select 1' -b -o /dev/null"
--health-cmd "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P $SA_PASSWORD -C -Q 'select 1' -b -o /dev/null"
Copy link
Member Author

Choose a reason for hiding this comment

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

note for reviewers: that's the path from MSSQL server 2018 and up - as we're using MSSQL server 2022 I assumed there would be a /opt/mssql-tools22/ directory but inspecting the file system of a running container shows that there's only /opt/mssql-tools18/

-C ignores the self-signed certificate

Copy link
Contributor

Choose a reason for hiding this comment

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

The best docs I've found for this image is the "Overview" section here: https://hub.docker.com/r/microsoft/mssql-server

Note Starting with SQL Server 2022 CU 14, we are updating SQL Server 2022 container images to include the new mssql-tools18 package. With the introduction of SQL Server 2022 CU 14, and in all future container images, the previous directory /opt/mssql-tools/bin will be phased out.

Where by "phased out" they mean: just gone. ;)

The version for the "mssql-tools" dir is, at least somewhat, independent of the mssql-server package. I believe that's why it is "mssql-tools18" even for versions of MSSQL server beyond 2018.

--health-interval 1s
--health-timeout 30s
--health-start-period 10s
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unit-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ jobs:
ports:
- 27017:27017
mssql:
image: mcr.microsoft.com/mssql/server:2017-latest
image: mcr.microsoft.com/mssql/server:2022-latest
env:
SA_PASSWORD: mssql_passw0rd
ACCEPT_EULA: Y
ports:
- 1433:1433
options: >-
--health-cmd "/opt/mssql-tools/bin/sqlcmd -U sa -P $SA_PASSWORD -Q 'select 1' -b -o /dev/null"
--health-cmd "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P $SA_PASSWORD -C -Q 'select 1' -b -o /dev/null"
--health-interval 1s
--health-timeout 30s
--health-start-period 10s
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-test-utils/src/test-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const dockerRunCmds = {
memcached:
'docker run --rm -d --name otel-memcached -p 11211:11211 memcached:1.6.9-alpine',
mssql:
'docker run --rm -d --name otel-mssql -p 1433:1433 -e SA_PASSWORD=mssql_passw0rd -e ACCEPT_EULA=Y mcr.microsoft.com/mssql/server:2017-latest',
'docker run --rm -d --name otel-mssql -p 1433:1433 -e SA_PASSWORD=mssql_passw0rd -e ACCEPT_EULA=Y mcr.microsoft.com/mssql/server:2022-latest',
mysql:
'docker run --rm -d --name otel-mysql -p 33306:3306 -e MYSQL_ROOT_PASSWORD=rootpw -e MYSQL_DATABASE=test_db -e MYSQL_USER=otel -e MYSQL_PASSWORD=secret mysql:5.7 --log_output=TABLE --general_log=ON',
postgres:
Expand Down
Loading