Skip to content

Commit 5181346

Browse files
committed
fix: chatwoot service
1 parent da8a453 commit 5181346

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed

templates/compose/chatwoot.yaml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@ services:
1515
- SECRET_KEY_BASE=$SERVICE_PASSWORD_CHATWOOT
1616
- FRONTEND_URL=${SERVICE_FQDN_CHATWOOT}
1717
- DEFAULT_LOCALE=${CHATWOOT_DEFAULT_LOCALE}
18-
- FORCE_SSL=false
19-
- ENABLE_ACCOUNT_SIGNUP=false
18+
- FORCE_SSL=${FORCE_SSL:-false}
19+
- ENABLE_ACCOUNT_SIGNUP=${ENABLE_ACCOUNT_SIGNUP:-false}
2020
- REDIS_URL=redis://default@redis:6379
2121
- REDIS_PASSWORD=$SERVICE_PASSWORD_REDIS
22-
- REDIS_OPENSSL_VERIFY_MODE=none
23-
- POSTGRES_DATABASE=chatwoot
24-
- POSTGRES_HOST=postgres
25-
- POSTGRES_USERNAME=$SERVICE_USER_POSTGRES_USER
22+
- REDIS_OPENSSL_VERIFY_MODE=${REDIS_OPENSSL_VERIFY_MODE:-none}
23+
- POSTGRES_DATABASE=${POSTGRES_DB:-chatwoot}
24+
- POSTGRES_HOST=${POSTGRES_HOST:-postgres}
25+
- POSTGRES_USERNAME=$SERVICE_USER_POSTGRES
2626
- POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES
27-
- RAILS_MAX_THREADS=5
28-
- NODE_ENV=production
29-
- RAILS_ENV=production
30-
- INSTALLATION_ENV=docker
27+
- RAILS_MAX_THREADS=${RAILS_MAX_THREADS:-5}
28+
- NODE_ENV=${NODE_ENV:-production}
29+
- RAILS_ENV=${RAILS_ENV:-production}
30+
- INSTALLATION_ENV=${INSTALLATION_ENV:-docker}
3131
- MAILER_SENDER_EMAIL=${CHATWOOT_MAILER_SENDER_EMAIL}
3232
- SMTP_ADDRESS=${CHATWOOT_SMTP_ADDRESS}
3333
- SMTP_AUTHENTICATION=${CHATWOOT_SMTP_AUTHENTICATION}
@@ -36,7 +36,7 @@ services:
3636
- SMTP_PORT=${CHATWOOT_SMTP_PORT}
3737
- SMTP_USERNAME=${CHATWOOT_SMTP_USERNAME}
3838
- SMTP_PASSWORD=${CHATWOOT_SMTP_PASSWORD}
39-
- ACTIVE_STORAGE_SERVICE=local
39+
- ACTIVE_STORAGE_SERVICE=${ACTIVE_STORAGE_SERVICE:-local}
4040
entrypoint: docker/entrypoints/rails.sh
4141
command: sh -c "bundle exec rails db:chatwoot_prepare && bundle exec rails s -p 3000 -b 0.0.0.0"
4242
volumes:
@@ -56,19 +56,19 @@ services:
5656
- SECRET_KEY_BASE=$SERVICE_PASSWORD_CHATWOOT
5757
- FRONTEND_URL=${SERVICE_FQDN_CHATWOOT}
5858
- DEFAULT_LOCALE=${CHATWOOT_DEFAULT_LOCALE}
59-
- FORCE_SSL=false
60-
- ENABLE_ACCOUNT_SIGNUP=false
59+
- FORCE_SSL=${FORCE_SSL:-false}
60+
- ENABLE_ACCOUNT_SIGNUP=${ENABLE_ACCOUNT_SIGNUP:-false}
6161
- REDIS_URL=redis://default@redis:6379
6262
- REDIS_PASSWORD=$SERVICE_PASSWORD_REDIS
63-
- REDIS_OPENSSL_VERIFY_MODE=none
64-
- POSTGRES_DATABASE=chatwoot
65-
- POSTGRES_HOST=postgres
66-
- POSTGRES_USERNAME=$SERVICE_USER_POSTGRES_USER
63+
- REDIS_OPENSSL_VERIFY_MODE=${REDIS_OPENSSL_VERIFY_MODE:-none}
64+
- POSTGRES_DATABASE=${POSTGRES_DB:-chatwoot}
65+
- POSTGRES_HOST=${POSTGRES_HOST:-postgres}
66+
- POSTGRES_USERNAME=$SERVICE_USER_POSTGRES
6767
- POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES
68-
- RAILS_MAX_THREADS=5
69-
- NODE_ENV=production
70-
- RAILS_ENV=production
71-
- INSTALLATION_ENV=docker
68+
- RAILS_MAX_THREADS=${RAILS_MAX_THREADS:-5}
69+
- NODE_ENV=${NODE_ENV:-production}
70+
- RAILS_ENV=${RAILS_ENV:-production}
71+
- INSTALLATION_ENV=${INSTALLATION_ENV:-docker}
7272
- MAILER_SENDER_EMAIL=${CHATWOOT_MAILER_SENDER_EMAIL}
7373
- SMTP_ADDRESS=${CHATWOOT_SMTP_ADDRESS}
7474
- SMTP_AUTHENTICATION=${CHATWOOT_SMTP_AUTHENTICATION}
@@ -77,7 +77,7 @@ services:
7777
- SMTP_PORT=${CHATWOOT_SMTP_PORT}
7878
- SMTP_USERNAME=${CHATWOOT_SMTP_USERNAME}
7979
- SMTP_PASSWORD=${CHATWOOT_SMTP_PASSWORD}
80-
- ACTIVE_STORAGE_SERVICE=local
80+
- ACTIVE_STORAGE_SERVICE=${ACTIVE_STORAGE_SERVICE:-local}
8181
command: ['bundle', 'exec', 'sidekiq', '-C', 'config/sidekiq.yml']
8282
volumes:
8383
- sidekiq-data:/app/storage
@@ -93,11 +93,11 @@ services:
9393
volumes:
9494
- postgres-data:/var/lib/postgresql/data
9595
environment:
96-
- POSTGRES_DB=chatwoot
97-
- POSTGRES_USER=$SERVICE_USER_POSTGRES_USER
96+
- POSTGRES_DB=${POSTGRES_DB:-chatwoot}
97+
- POSTGRES_USER=$SERVICE_USER_POSTGRES
9898
- POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES
9999
healthcheck:
100-
test: ["CMD-SHELL", "pg_isready -U $SERVICE_USER_POSTGRES_USER -d chatwoot -h 127.0.0.1"]
100+
test: ["CMD-SHELL", "pg_isready -U $SERVICE_USER_POSTGRES -d chatwoot -h 127.0.0.1"]
101101
interval: 30s
102102
timeout: 10s
103103
retries: 5

templates/service-templates.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)