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

Jump to bottom

[8.8](backport #35237) Fix cockroachdb/cockroach Docker image for CI #35241

Merged
merged 2 commits into from
Apr 27, 2023
Merged

[8.8](backport #35237) Fix cockroachdb/cockroach Docker image for CI #35241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90000e0
Fix cockroachdb/cockroach Docker image for CI (#35237)
michalpristas Apr 27, 2023
91d35bd
Merge branch '8.8' into mergify/bp/8.8/pr-35237
cmacknz Apr 27, 2023
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
4 changes: 1 addition & 3 deletions x-pack/metricbeat/module/cockroachdb/_meta/Dockerfile
View file
Open in desktop
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
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:
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