Merge remote-tracking branch 'refs/remotes/origin/main'
This commit is contained in:
+3
-3
@@ -866,7 +866,7 @@ services:
|
|||||||
entrypoint: web-entrypoint.sh
|
entrypoint: web-entrypoint.sh
|
||||||
environment:
|
environment:
|
||||||
RAILS_ENV: development
|
RAILS_ENV: development
|
||||||
REDIS_URL: redis://redis:6379/
|
REDIS_URL: redis://redis:6379
|
||||||
DATABASE_HOST: dawarich-pg-db
|
DATABASE_HOST: dawarich-pg-db
|
||||||
DATABASE_USERNAME: dawarich
|
DATABASE_USERNAME: dawarich
|
||||||
DATABASE_PASSWORD: ${DAWARICH_PG_PASSWORD}
|
DATABASE_PASSWORD: ${DAWARICH_PG_PASSWORD}
|
||||||
@@ -918,7 +918,7 @@ services:
|
|||||||
POSTGRES_USER: dawarich
|
POSTGRES_USER: dawarich
|
||||||
POSTGRES_PASSWORD: ${DAWARICH_PG_PASSWORD}
|
POSTGRES_PASSWORD: ${DAWARICH_PG_PASSWORD}
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: [ "CMD-SHELL", "pg_isready -U postgres -d dawarich_development" ]
|
test: [ "CMD-SHELL", "pg_isready -U dawarich -d dawarich" ]
|
||||||
interval: 10s
|
interval: 10s
|
||||||
retries: 5
|
retries: 5
|
||||||
start_period: 30s
|
start_period: 30s
|
||||||
@@ -950,7 +950,7 @@ services:
|
|||||||
entrypoint: sidekiq-entrypoint.sh
|
entrypoint: sidekiq-entrypoint.sh
|
||||||
environment:
|
environment:
|
||||||
RAILS_ENV: development
|
RAILS_ENV: development
|
||||||
REDIS_URL: redis://redis:6379/
|
REDIS_URL: redis://redis:6379
|
||||||
DATABASE_HOST: dawarich-pg-db
|
DATABASE_HOST: dawarich-pg-db
|
||||||
DATABASE_USERNAME: dawarich
|
DATABASE_USERNAME: dawarich
|
||||||
DATABASE_PASSWORD: ${DAWARICH_PG_PASSWORD}
|
DATABASE_PASSWORD: ${DAWARICH_PG_PASSWORD}
|
||||||
|
|||||||
Reference in New Issue
Block a user