Skip to content

Commit 5507c36

Browse files
pichlermarctrentm
andauthored
ci: update mssql server image to 2022-latest and update healthcheck to work (#2446)
Co-authored-by: Trent Mick <[email protected]>
1 parent ee5c584 commit 5507c36

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.github/workflows/test-all-versions.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ jobs:
2626
ports:
2727
- 27017:27017
2828
mssql:
29-
image: mcr.microsoft.com/mssql/server:2017-latest
29+
image: mcr.microsoft.com/mssql/server:2022-latest
3030
env:
3131
SA_PASSWORD: mssql_passw0rd
3232
ACCEPT_EULA: Y
3333
ports:
3434
- 1433:1433
3535
options: >-
36-
--health-cmd "/opt/mssql-tools/bin/sqlcmd -U sa -P $SA_PASSWORD -Q 'select 1' -b -o /dev/null"
36+
--health-cmd "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P $SA_PASSWORD -C -Q 'select 1' -b -o /dev/null"
3737
--health-interval 1s
3838
--health-timeout 30s
3939
--health-start-period 10s

.github/workflows/unit-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ jobs:
2424
ports:
2525
- 27017:27017
2626
mssql:
27-
image: mcr.microsoft.com/mssql/server:2017-latest
27+
image: mcr.microsoft.com/mssql/server:2022-latest
2828
env:
2929
SA_PASSWORD: mssql_passw0rd
3030
ACCEPT_EULA: Y
3131
ports:
3232
- 1433:1433
3333
options: >-
34-
--health-cmd "/opt/mssql-tools/bin/sqlcmd -U sa -P $SA_PASSWORD -Q 'select 1' -b -o /dev/null"
34+
--health-cmd "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P $SA_PASSWORD -C -Q 'select 1' -b -o /dev/null"
3535
--health-interval 1s
3636
--health-timeout 30s
3737
--health-start-period 10s

packages/opentelemetry-test-utils/src/test-utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const dockerRunCmds = {
3939
memcached:
4040
'docker run --rm -d --name otel-memcached -p 11211:11211 memcached:1.6.9-alpine',
4141
mssql:
42-
'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',
42+
'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',
4343
mysql:
4444
'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',
4545
postgres:

0 commit comments

Comments
 (0)