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

[8.x](backport #41104) x-pack/metricbeat/module/mssql: Update mssql image version to avoid SIGABRT and update HEALTHCHECK #41113

Merged
merged 1 commit into from
Oct 7, 2024
Merged

[8.x](backport #41104) x-pack/metricbeat/module/mssql: Update mssql image version to avoid SIGABRT and update HEALTHCHECK #41113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion x-pack/metricbeat/module/mssql/_meta/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ ENV SA_PASSWORD='1234_asdf'

# Use the same healthcheck as the Windows version of the image.
# https://github.com/Microsoft/mssql-docker/blob/a3020afeec9be1eb2d67645ac739438eb8f2c545/windows/mssql-server-windows/dockerfile#L31
HEALTHCHECK --interval=1s --retries=90 CMD /opt/mssql-tools/bin/sqlcmd -U SA -P ${SA_PASSWORD} -Q "select 1"
HEALTHCHECK --interval=10s --timeout=3s --start-period=10s --retries=3 CMD /opt/mssql-tools18/bin/sqlcmd -S localhost -U SA -P ${SA_PASSWORD} -No -Q "SELECT 1" || exit 1
2 changes: 1 addition & 1 deletion x-pack/metricbeat/module/mssql/_meta/supported-versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
variants:
- MSSQL_VERSION: 2017-CU31-GDR2-ubuntu-18.04
- MSSQL_VERSION: 2019-CU28-ubuntu-20.04
4 changes: 2 additions & 2 deletions x-pack/metricbeat/module/mssql/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ version: '2.3'

services:
mssql:
image: docker.elastic.co/integrations-ci/beats-mssql:${MSSQL_VERSION:-2017-CU31-GDR2-ubuntu-18.04}-1
image: docker.elastic.co/integrations-ci/beats-mssql:${MSSQL_VERSION:-2019-CU28-ubuntu-20.04}-1
build:
context: ./_meta
args:
MSSQL_VERSION: ${MSSQL_VERSION:-2017-CU31-GDR2-ubuntu-18.04}
MSSQL_VERSION: ${MSSQL_VERSION:-2019-CU28-ubuntu-20.04}
ports:
- 1433
Loading