From 50ff1fc4139708435c680529b6f0142d636ee9f0 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 29 Jun 2021 09:39:21 +0100 Subject: [PATCH] fix: update MSSQL Server linux image's Docker registry (#26440) (#26485) --- x-pack/metricbeat/module/mssql/_meta/Dockerfile | 2 +- x-pack/metricbeat/module/mssql/_meta/supported-versions.yml | 2 ++ x-pack/metricbeat/module/mssql/docker-compose.yml | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 x-pack/metricbeat/module/mssql/_meta/supported-versions.yml diff --git a/x-pack/metricbeat/module/mssql/_meta/Dockerfile b/x-pack/metricbeat/module/mssql/_meta/Dockerfile index dded9f0f2a5..29c116faf71 100644 --- a/x-pack/metricbeat/module/mssql/_meta/Dockerfile +++ b/x-pack/metricbeat/module/mssql/_meta/Dockerfile @@ -1,5 +1,5 @@ ARG MSSQL_VERSION -FROM microsoft/mssql-server-linux:${MSSQL_VERSION} +FROM mcr.microsoft.com/mssql/server:${MSSQL_VERSION} ENV ACCEPT_EULA='Y' ENV SA_PASSWORD='1234_asdf' diff --git a/x-pack/metricbeat/module/mssql/_meta/supported-versions.yml b/x-pack/metricbeat/module/mssql/_meta/supported-versions.yml new file mode 100644 index 00000000000..e9f409a2875 --- /dev/null +++ b/x-pack/metricbeat/module/mssql/_meta/supported-versions.yml @@ -0,0 +1,2 @@ +variants: + - MSSQL_VERSION: 2017-GA-ubuntu diff --git a/x-pack/metricbeat/module/mssql/docker-compose.yml b/x-pack/metricbeat/module/mssql/docker-compose.yml index e9362795a6a..9fce8257135 100644 --- a/x-pack/metricbeat/module/mssql/docker-compose.yml +++ b/x-pack/metricbeat/module/mssql/docker-compose.yml @@ -2,10 +2,10 @@ version: '2.3' services: mssql: - image: docker.elastic.co/integrations-ci/beats-mssql:${MSSQL_VERSION:-2017-GA}-1 + image: docker.elastic.co/integrations-ci/beats-mssql:${MSSQL_VERSION:-2017-GA-ubuntu}-1 build: context: ./_meta args: - MSSQL_VERSION: ${MSSQL_VERSION:-2017-GA} + MSSQL_VERSION: ${MSSQL_VERSION:-2017-GA-ubuntu} ports: - 1433