Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
chore: Updated docker compose configuration
  • Loading branch information
jsumners-nr committed Jun 12, 2024
commit 029b40a4617f95085d2d83f9d0002c171cd9465a
11 changes: 6 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:

elasticsearch:
Expand Down Expand Up @@ -63,7 +62,7 @@ services:

mongodb_3:
container_name: nr_node_mongodb
platform: linux/amd64
platform: ${DOCKER_PLATFORM:-linux/amd64}
image: library/mongo:3
ports:
- "27017:27017"
Expand All @@ -86,6 +85,8 @@ services:

mysql:
container_name: nr_node_mysql
# The `mysql:5` image does not have a `linux/arm64` build.
# We cannot use the latest mysql image because our tests fail.
platform: linux/amd64
image: mysql:5
ports:
Expand All @@ -111,15 +112,15 @@ services:

cassandra:
container_name: nr_node_cassandra
platform: linux/amd64
image: zmarcantel/cassandra
platform: ${DOCKER_PLATFORM:-linux/amd64}
image: cassandra
ports:
- "9042:9042"
healthcheck:
test: [ "CMD", "cqlsh", "-u cassandra", "-p cassandra"]
interval: 5s
timeout: 10s
retries: 6
retries: 20

# pg 9.2 has built in healthcheck
pg:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
"lint:fix": "eslint --fix, ./*.{js,mjs} lib test bin examples",
"public-docs": "jsdoc -c ./jsdoc-conf.jsonc && cp examples/shim/*.png out/",
"publish-docs": "./bin/publish-docs.sh",
"services": "docker compose up -d --wait",
"services": "DOCKER_PLATFORM=linux/$(uname -m) docker compose up -d --wait",
"services:stop": "docker compose down",
"smoke": "npm run ssl && time tap test/smoke/**/**/*.tap.js --timeout=180 --no-coverage",
"ssl": "./bin/ssl.sh",
Expand Down