From af115f0d53bfe73f5441a06bba8bb8dd73982d6e Mon Sep 17 00:00:00 2001 From: Michal Pristas Date: Thu, 27 Apr 2023 11:19:02 +0200 Subject: [PATCH] Fix cockroachdb/cockroach Docker image for CI (#35237) --- x-pack/metricbeat/module/cockroachdb/_meta/Dockerfile | 4 +--- x-pack/metricbeat/module/cockroachdb/docker-compose.yml | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/x-pack/metricbeat/module/cockroachdb/_meta/Dockerfile b/x-pack/metricbeat/module/cockroachdb/_meta/Dockerfile index ea40f603855..ff4a5130a46 100644 --- a/x-pack/metricbeat/module/cockroachdb/_meta/Dockerfile +++ b/x-pack/metricbeat/module/cockroachdb/_meta/Dockerfile @@ -1,8 +1,6 @@ ARG COCKROACHDB_VERSION FROM cockroachdb/cockroach:v${COCKROACHDB_VERSION} -RUN apt-get update && apt-get install -y curl - HEALTHCHECK --interval=1s --retries=90 CMD curl -q http://localhost:8080/_stats/vars -CMD ["start", "--insecure"] +CMD ["start-single-node", "--insecure"] diff --git a/x-pack/metricbeat/module/cockroachdb/docker-compose.yml b/x-pack/metricbeat/module/cockroachdb/docker-compose.yml index 7fed4573610..ad5b0aa40dd 100644 --- a/x-pack/metricbeat/module/cockroachdb/docker-compose.yml +++ b/x-pack/metricbeat/module/cockroachdb/docker-compose.yml @@ -2,10 +2,10 @@ version: '2.3' services: cockroachdb: - image: docker.elastic.co/integrations-ci/beats-cockroachdb:${COCKROACHDB_VERSION:-19.1.1}-1 + image: docker.elastic.co/integrations-ci/beats-cockroachdb:${COCKROACHDB_VERSION:-22.1.19}-1 build: context: ./_meta args: - COCKROACHDB_VERSION: ${COCKROACHDB_VERSION:-19.1.1} + COCKROACHDB_VERSION: ${COCKROACHDB_VERSION:-22.1.19} ports: - 8080