1
0
Fork 0
mirror of synced 2024-07-07 15:25:52 +12:00

Merge branch 'master' into feature/sqs-license

This commit is contained in:
Michael Drury 2023-12-08 16:05:52 +00:00 committed by GitHub
commit 5f94590dda
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -57,7 +57,6 @@ services:
depends_on: depends_on:
- redis-service - redis-service
- minio-service - minio-service
- couch-init
minio-service: minio-service:
restart: unless-stopped restart: unless-stopped
@ -70,7 +69,7 @@ services:
MINIO_BROWSER: "off" MINIO_BROWSER: "off"
command: server /data --console-address ":9001" command: server /data --console-address ":9001"
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"] test: "timeout 5s bash -c ':> /dev/tcp/127.0.0.1/9000' || exit 1"
interval: 30s interval: 30s
timeout: 20s timeout: 20s
retries: 3 retries: 3
@ -98,26 +97,15 @@ services:
couchdb-service: couchdb-service:
restart: unless-stopped restart: unless-stopped
image: ibmcom/couchdb3 image: budibase/couchdb
pull_policy: always
environment: environment:
- COUCHDB_PASSWORD=${COUCH_DB_PASSWORD} - COUCHDB_PASSWORD=${COUCH_DB_PASSWORD}
- COUCHDB_USER=${COUCH_DB_USER} - COUCHDB_USER=${COUCH_DB_USER}
- TARGETBUILD=docker-compose
volumes: volumes:
- couchdb3_data:/opt/couchdb/data - couchdb3_data:/opt/couchdb/data
couch-init:
image: curlimages/curl
environment:
PUT_CALL: "curl -u ${COUCH_DB_USER}:${COUCH_DB_PASSWORD} -X PUT couchdb-service:5984"
depends_on:
- couchdb-service
command:
[
"sh",
"-c",
"sleep 10 && $${PUT_CALL}/_users && $${PUT_CALL}/_replicator; fg;",
]
redis-service: redis-service:
restart: unless-stopped restart: unless-stopped
image: redis image: redis