Skip to content

Commit eb1cce9

Browse files
authoredJun 12, 2024··
chore: Updated docker compose configuration (#2268)
1 parent 6c964b2 commit eb1cce9

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed
 

‎docker-compose.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
version: "3"
21
services:
32

43
elasticsearch:
@@ -63,7 +62,7 @@ services:
6362

6463
mongodb_3:
6564
container_name: nr_node_mongodb
66-
platform: linux/amd64
65+
platform: ${DOCKER_PLATFORM:-linux/amd64}
6766
image: library/mongo:3
6867
ports:
6968
- "27017:27017"
@@ -86,6 +85,8 @@ services:
8685

8786
mysql:
8887
container_name: nr_node_mysql
88+
# The `mysql:5` image does not have a `linux/arm64` build.
89+
# We cannot use the latest mysql image because our tests fail.
8990
platform: linux/amd64
9091
image: mysql:5
9192
ports:
@@ -111,15 +112,15 @@ services:
111112

112113
cassandra:
113114
container_name: nr_node_cassandra
114-
platform: linux/amd64
115-
image: zmarcantel/cassandra
115+
platform: ${DOCKER_PLATFORM:-linux/amd64}
116+
image: cassandra
116117
ports:
117118
- "9042:9042"
118119
healthcheck:
119120
test: [ "CMD", "cqlsh", "-u cassandra", "-p cassandra"]
120121
interval: 5s
121122
timeout: 10s
122-
retries: 6
123+
retries: 20
123124

124125
# pg 9.2 has built in healthcheck
125126
pg:

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
"lint:fix": "eslint --fix, ./*.{js,mjs} lib test bin examples",
164164
"public-docs": "jsdoc -c ./jsdoc-conf.jsonc && cp examples/shim/*.png out/",
165165
"publish-docs": "./bin/publish-docs.sh",
166-
"services": "docker compose up -d --wait",
166+
"services": "DOCKER_PLATFORM=linux/$(uname -m) docker compose up -d --wait",
167167
"services:stop": "docker compose down",
168168
"smoke": "npm run ssl && time tap test/smoke/**/**/*.tap.js --timeout=180 --no-coverage",
169169
"ssl": "./bin/ssl.sh",

0 commit comments

Comments
 (0)
Please sign in to comment.