diff --git a/docker/quick-setup/consul-service-discovery/docker-compose.yml b/docker/quick-setup/consul-service-discovery/docker-compose.yml index 68a5c281212..b448784d29f 100644 --- a/docker/quick-setup/consul-service-discovery/docker-compose.yml +++ b/docker/quick-setup/consul-service-discovery/docker-compose.yml @@ -49,6 +49,7 @@ services: volumes: - data-mongo:/data/db - ./.logs/apim-mongodb:/var/log/mongodb + - ./../scripts/mongo:/docker-entrypoint-initdb.d/ healthcheck: test: mongosh --eval 'db.runCommand({serverStatus:1}).ok' --quiet | grep 1 interval: 5s diff --git a/docker/quick-setup/ee-with-alert-engine/docker-compose.yml b/docker/quick-setup/ee-with-alert-engine/docker-compose.yml index f36569fc138..d4b34a763f6 100644 --- a/docker/quick-setup/ee-with-alert-engine/docker-compose.yml +++ b/docker/quick-setup/ee-with-alert-engine/docker-compose.yml @@ -37,6 +37,7 @@ services: volumes: - data-mongo:/data/db - ./.logs/apim-mongodb:/var/log/mongodb + - ./../scripts/mongo:/docker-entrypoint-initdb.d/ healthcheck: test: mongosh --eval 'db.runCommand({serverStatus:1}).ok' --quiet | grep 1 interval: 5s diff --git a/docker/quick-setup/eureka-service-discovery/docker-compose.yml b/docker/quick-setup/eureka-service-discovery/docker-compose.yml index 26ddd537a8d..f9f21f24699 100644 --- a/docker/quick-setup/eureka-service-discovery/docker-compose.yml +++ b/docker/quick-setup/eureka-service-discovery/docker-compose.yml @@ -65,6 +65,7 @@ services: volumes: - data-mongo:/data/db - ./.logs/apim-mongodb:/var/log/mongodb + - ./../scripts/mongo:/docker-entrypoint-initdb.d/ networks: - storage diff --git a/docker/quick-setup/gateway-http-bridge-repository/docker-compose.yml b/docker/quick-setup/gateway-http-bridge-repository/docker-compose.yml index 49b4a9af20d..ce477e96bb4 100644 --- a/docker/quick-setup/gateway-http-bridge-repository/docker-compose.yml +++ b/docker/quick-setup/gateway-http-bridge-repository/docker-compose.yml @@ -35,6 +35,7 @@ services: volumes: - data-mongo:/data/db - ./.logs/apim-mongodb:/var/log/mongodb + - ./../scripts/mongo:/docker-entrypoint-initdb.d/ healthcheck: test: mongosh --eval 'db.runCommand({serverStatus:1}).ok' --quiet | grep 1 interval: 5s diff --git a/docker/quick-setup/https-gateway/docker-compose.yml b/docker/quick-setup/https-gateway/docker-compose.yml index 01f4773e3ea..8e025d36ee3 100644 --- a/docker/quick-setup/https-gateway/docker-compose.yml +++ b/docker/quick-setup/https-gateway/docker-compose.yml @@ -35,6 +35,7 @@ services: volumes: - data-mongo:/data/db - ./.logs/apim-mongodb:/var/log/mongodb + - ./../scripts/mongo:/docker-entrypoint-initdb.d/ healthcheck: test: mongosh --eval 'db.runCommand({serverStatus:1}).ok' --quiet | grep 1 interval: 5s diff --git a/docker/quick-setup/https-nginx/docker-compose.yml b/docker/quick-setup/https-nginx/docker-compose.yml index c1e32ae2197..18f48b370d6 100644 --- a/docker/quick-setup/https-nginx/docker-compose.yml +++ b/docker/quick-setup/https-nginx/docker-compose.yml @@ -49,6 +49,7 @@ services: volumes: - data-mongo:/data/db - ./.logs/apim-mongodb:/var/log/mongodb + - ./../scripts/mongo:/docker-entrypoint-initdb.d/ healthcheck: test: mongosh --eval 'db.runCommand({serverStatus:1}).ok' --quiet | grep 1 interval: 5s diff --git a/docker/quick-setup/keycloak/docker-compose.yml b/docker/quick-setup/keycloak/docker-compose.yml index 637c573230e..284d99036ab 100644 --- a/docker/quick-setup/keycloak/docker-compose.yml +++ b/docker/quick-setup/keycloak/docker-compose.yml @@ -67,6 +67,7 @@ services: volumes: - data-mongo:/data/db - ./.logs/apim-mongodb:/var/log/mongodb + - ./../scripts/mongo:/docker-entrypoint-initdb.d/ healthcheck: test: mongosh --eval 'db.runCommand({serverStatus:1}).ok' --quiet | grep 1 interval: 5s diff --git a/docker/quick-setup/kibana/docker-compose.yml b/docker/quick-setup/kibana/docker-compose.yml index a5854d7752b..094edd07381 100644 --- a/docker/quick-setup/kibana/docker-compose.yml +++ b/docker/quick-setup/kibana/docker-compose.yml @@ -36,6 +36,7 @@ services: volumes: - data-mongo:/data/db - ./.logs/apim-mongodb:/var/log/mongodb + - ./../scripts/mongo:/docker-entrypoint-initdb.d/ healthcheck: test: mongosh --eval 'db.runCommand({serverStatus:1}).ok' --quiet | grep 1 interval: 5s diff --git a/docker/quick-setup/mongodb/docker-compose.yml b/docker/quick-setup/mongodb/docker-compose.yml index c3dcc4ce971..e3f77a825c7 100644 --- a/docker/quick-setup/mongodb/docker-compose.yml +++ b/docker/quick-setup/mongodb/docker-compose.yml @@ -37,6 +37,7 @@ services: volumes: - data-mongo:/data/db - ./.logs/apim-mongodb:/var/log/mongodb + - ./../scripts/mongo:/docker-entrypoint-initdb.d/ healthcheck: test: mongosh --eval 'db.runCommand({serverStatus:1}).ok' --quiet | grep 1 interval: 5s diff --git a/docker/quick-setup/native-kafka/docker-compose.yml b/docker/quick-setup/native-kafka/docker-compose.yml index 2c58d338785..61904ba7225 100644 --- a/docker/quick-setup/native-kafka/docker-compose.yml +++ b/docker/quick-setup/native-kafka/docker-compose.yml @@ -42,6 +42,7 @@ services: volumes: - data-mongo:/data/db - ./.logs/apim-mongodb:/var/log/mongodb + - ./../scripts/mongo:/docker-entrypoint-initdb.d/ healthcheck: test: mongosh --eval 'db.runCommand({serverStatus:1}).ok' --quiet | grep 1 interval: 5s diff --git a/docker/quick-setup/nginx/docker-compose.yml b/docker/quick-setup/nginx/docker-compose.yml index 81cefaae676..238ab5c0851 100644 --- a/docker/quick-setup/nginx/docker-compose.yml +++ b/docker/quick-setup/nginx/docker-compose.yml @@ -48,6 +48,7 @@ services: volumes: - data-mongo:/data/db - ./.logs/apim-mongodb:/var/log/mongodb + - ./../scripts/mongo:/docker-entrypoint-initdb.d/ healthcheck: test: mongosh --eval 'db.runCommand({serverStatus:1}).ok' --quiet | grep 1 interval: 5s diff --git a/docker/quick-setup/opensearch/docker-compose.yml b/docker/quick-setup/opensearch/docker-compose.yml index 4a901422c3b..7d71550664c 100644 --- a/docker/quick-setup/opensearch/docker-compose.yml +++ b/docker/quick-setup/opensearch/docker-compose.yml @@ -35,6 +35,7 @@ services: volumes: - data-mongo:/data/db - ./.logs/apim-mongodb:/var/log/mongodb + - ./../scripts/mongo:/docker-entrypoint-initdb.d/ networks: - storage diff --git a/docker/quick-setup/prometheus/docker-compose.yml b/docker/quick-setup/prometheus/docker-compose.yml index f7b0dfeacf3..2a1816bd265 100644 --- a/docker/quick-setup/prometheus/docker-compose.yml +++ b/docker/quick-setup/prometheus/docker-compose.yml @@ -37,6 +37,7 @@ services: volumes: - data-mongo:/data/db - ./.logs/apim-mongodb:/var/log/mongodb + - ./../scripts/mongo:/docker-entrypoint-initdb.d/ healthcheck: test: mongosh --eval 'db.runCommand({serverStatus:1}).ok' --quiet | grep 1 interval: 5s diff --git a/docker/quick-setup/redis-rate-limit/docker-compose.yml b/docker/quick-setup/redis-rate-limit/docker-compose.yml index 8240cbfecf6..7ad88e600dd 100644 --- a/docker/quick-setup/redis-rate-limit/docker-compose.yml +++ b/docker/quick-setup/redis-rate-limit/docker-compose.yml @@ -37,6 +37,7 @@ services: volumes: - data-mongo:/data/db - ./.logs/apim-mongodb:/var/log/mongodb + - ./../scripts/mongo:/docker-entrypoint-initdb.d/ healthcheck: test: mongosh --eval 'db.runCommand({serverStatus:1}).ok' --quiet | grep 1 interval: 5s diff --git a/docker/quick-setup/scripts/mongo/init.js b/docker/quick-setup/scripts/mongo/init.js new file mode 100644 index 00000000000..fe5b09fbc00 --- /dev/null +++ b/docker/quick-setup/scripts/mongo/init.js @@ -0,0 +1,16 @@ +/* + * Copyright © 2015 The Gravitee team (http://gravitee.io) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +rs.initiate({_id:'rs0',members:[{_id:0,host:'mongodb:27017'}]}); \ No newline at end of file diff --git a/docker/quick-setup/systemProxy/docker-compose.yml b/docker/quick-setup/systemProxy/docker-compose.yml index 48fda4d1339..9ce48146219 100644 --- a/docker/quick-setup/systemProxy/docker-compose.yml +++ b/docker/quick-setup/systemProxy/docker-compose.yml @@ -51,6 +51,7 @@ services: volumes: - data-mongo:/data/db - ./.logs/apim-mongodb:/var/log/mongodb + - ./../scripts/mongo:/docker-entrypoint-initdb.d/ healthcheck: test: mongosh --eval 'db.runCommand({serverStatus:1}).ok' --quiet | grep 1 interval: 5s diff --git a/docker/quick-setup/tcp/docker-compose.yml b/docker/quick-setup/tcp/docker-compose.yml index 70cbe00d1a8..52884f36681 100644 --- a/docker/quick-setup/tcp/docker-compose.yml +++ b/docker/quick-setup/tcp/docker-compose.yml @@ -37,6 +37,7 @@ services: volumes: - data-mongo:/data/db - ./.logs/apim-mongodb:/var/log/mongodb + - ./../scripts/mongo:/docker-entrypoint-initdb.d/ healthcheck: test: mongosh --eval 'db.runCommand({serverStatus:1}).ok' --quiet | grep 1 interval: 5s diff --git a/gravitee-apim-e2e/docker/common/docker-compose-mongo.yml b/gravitee-apim-e2e/docker/common/docker-compose-mongo.yml index 386a1c84fa1..d16464dd993 100644 --- a/gravitee-apim-e2e/docker/common/docker-compose-mongo.yml +++ b/gravitee-apim-e2e/docker/common/docker-compose-mongo.yml @@ -30,11 +30,14 @@ services: volumes: - data-mongo:/data/db - ./.logs/apim-mongodb:/var/log/mongodb + - ./scripts/mongo:/docker-entrypoint-initdb.d/ healthcheck: - test: mongosh --eval 'db.runCommand({serverStatus:1}).ok' --quiet | grep 1 + test: echo "try { rs.status() } catch (err) { rs.initiate({_id:'rs0',members:[{_id:0,host:'database:27017'}]}) }" | mongosh --port 27017 --quiet interval: 2s - timeout: 10s - retries: 5 + timeout: 30s + start_period: 0s + start_interval: 1s + retries: 30 networks: - storage diff --git a/gravitee-apim-e2e/docker/common/scripts/mongo/init.js b/gravitee-apim-e2e/docker/common/scripts/mongo/init.js new file mode 100644 index 00000000000..5ff3e42368d --- /dev/null +++ b/gravitee-apim-e2e/docker/common/scripts/mongo/init.js @@ -0,0 +1 @@ +rs.initiate({_id:'rs0',members:[{_id:0,host:'database:27017'}]}); \ No newline at end of file