generated from coop-cloud/example
fix: postgres healthcheck, autoformat
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
parent
f1a5a09dc7
commit
012b672e7a
19
compose.yml
19
compose.yml
|
@ -8,7 +8,7 @@ services:
|
|||
stdin_open: true
|
||||
networks:
|
||||
- proxy
|
||||
- internal
|
||||
- internal
|
||||
environment:
|
||||
DB_TYPE: postgres
|
||||
DB_HOST: db
|
||||
|
@ -17,13 +17,13 @@ services:
|
|||
DB_USER: onlyoffice
|
||||
DB_PWD_FILE: /run/secrets/db_password
|
||||
AMQP_URI: amqp://guest:guest@rabbitmq
|
||||
AUTO_ASSEMBLY_ENABLED:
|
||||
AUTO_ASSEMBLY_INTERVAL:
|
||||
AUTO_ASSEMBLY_STEP:
|
||||
AUTO_ASSEMBLY_ENABLED:
|
||||
AUTO_ASSEMBLY_INTERVAL:
|
||||
AUTO_ASSEMBLY_STEP:
|
||||
secrets:
|
||||
- db_password
|
||||
healthcheck:
|
||||
test: ["CMD", "curl", "-f", "http://localhost/welcome"]
|
||||
test: [ "CMD", "curl", "-f", "http://localhost/welcome" ]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 10
|
||||
|
@ -48,7 +48,7 @@ services:
|
|||
- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-fwdproto"
|
||||
- "traefik.http.middlewares.${STACK_NAME}-fwdproto.headers.customRequestHeaders.X-Forwarded-Proto=https"
|
||||
- "coop-cloud.${STACK_NAME}.version=2.5.1+7.3.3"
|
||||
|
||||
|
||||
rabbitmq:
|
||||
image: rabbitmq:3.11.13
|
||||
networks:
|
||||
|
@ -59,7 +59,7 @@ services:
|
|||
timeout: 10s
|
||||
retries: 10
|
||||
start_period: 1m
|
||||
|
||||
|
||||
db:
|
||||
image: postgres:9.5
|
||||
environment:
|
||||
|
@ -73,7 +73,7 @@ services:
|
|||
networks:
|
||||
- internal
|
||||
healthcheck:
|
||||
test: ["CMD", "pg_isready"]
|
||||
test: [ "CMD", "pg_isready", "-U", "onlyoffice" ]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 10
|
||||
|
@ -82,11 +82,13 @@ services:
|
|||
volumes:
|
||||
db:
|
||||
|
||||
|
||||
networks:
|
||||
proxy:
|
||||
external: true
|
||||
internal:
|
||||
|
||||
|
||||
secrets:
|
||||
db_password:
|
||||
external: true
|
||||
|
@ -97,4 +99,3 @@ configs:
|
|||
name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_VERSION}
|
||||
file: entrypoint.sh.tmpl
|
||||
template_driver: golang
|
||||
|
||||
|
|
Loading…
Reference in New Issue