mirror of
https://gitlab.com/openstapps/openstapps.git
synced 2026-01-08 06:22:53 +00:00
Merge branch '1-backend-should-wait-for-the-database-to-be-ready' into 'master'
Resolve "Backend should "wait" for the database to be ready" Closes #1 See merge request openstapps/minimal-deployment!1
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
version: '2'
|
version: '2.1'
|
||||||
services:
|
services:
|
||||||
database:
|
database:
|
||||||
image: registry.gitlab.com/openstapps/database:master
|
image: registry.gitlab.com/openstapps/database:master
|
||||||
@@ -6,6 +6,12 @@ services:
|
|||||||
- ./database:/usr/share/elasticsearch/data
|
- ./database:/usr/share/elasticsearch/data
|
||||||
expose:
|
expose:
|
||||||
- "9200"
|
- "9200"
|
||||||
|
restart: unless-stopped
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD", "nc", "-zv", "localhost", "9200"]
|
||||||
|
interval: 5s
|
||||||
|
timeout: 10s
|
||||||
|
retries: 20
|
||||||
|
|
||||||
backend:
|
backend:
|
||||||
image: registry.gitlab.com/openstapps/backend/default:master
|
image: registry.gitlab.com/openstapps/backend/default:master
|
||||||
@@ -22,6 +28,10 @@ services:
|
|||||||
- "database"
|
- "database"
|
||||||
labels:
|
labels:
|
||||||
- stapps.version=1.0.0
|
- stapps.version=1.0.0
|
||||||
|
restart: unless-stopped
|
||||||
|
depends_on:
|
||||||
|
database:
|
||||||
|
condition: service_healthy
|
||||||
|
|
||||||
api:
|
api:
|
||||||
image: registry.gitlab.com/openstapps/api/copy:v0.0.3
|
image: registry.gitlab.com/openstapps/api/copy:v0.0.3
|
||||||
|
|||||||
Reference in New Issue
Block a user