Skip to content

Commit

Permalink
Fix cockroachdb/cockroach Docker image for CI (#35237) (#35306)
Browse files Browse the repository at this point in the history
(cherry picked from commit af115f0)

Co-authored-by: Michal Pristas <[email protected]>
  • Loading branch information
mergify[bot] and michalpristas authored May 4, 2023
1 parent 55100d1 commit 11a24fb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
4 changes: 1 addition & 3 deletions x-pack/metricbeat/module/cockroachdb/_meta/Dockerfile
Original file line number Diff line number Diff line change
@@ -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"]
4 changes: 2 additions & 2 deletions x-pack/metricbeat/module/cockroachdb/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 11a24fb

Please sign in to comment.