Skip to content

Commit

Permalink
x-pack/metricbeat/module/mssql: Update mssql image version to avoid S…
Browse files Browse the repository at this point in the history
…IGABRT and update HEALTHCHECK (#41104) (#41113)

(cherry picked from commit 43301bc)

Co-authored-by: subham sarkar <subham.sarkar@elastic.co>
  • Loading branch information
mergify[bot] and shmsr authored Oct 7, 2024
1 parent daa8097 commit 0313e84
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion x-pack/metricbeat/module/mssql/_meta/Dockerfile
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
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
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

0 comments on commit 0313e84

Please sign in to comment.