Reuse env vars, fix worker config, remove cruft
This commit is contained in:
parent
ac5e1beef4
commit
0d70ef6838
77
compose.yml
77
compose.yml
|
@ -1,4 +1,35 @@
|
||||||
|
---
|
||||||
version: "3.8"
|
version: "3.8"
|
||||||
|
|
||||||
|
x-environment: &default-env
|
||||||
|
DATABASE_URL: postgresql://postgres:password@db/loomio_production
|
||||||
|
REDIS_URL: redis://redis:6379
|
||||||
|
CANONICAL_HOST: ${DOMAIN}
|
||||||
|
VIRTUAL_HOST: ${DOMAIN}
|
||||||
|
CHANNELS_URI: wss://channels.${DOMAIN}
|
||||||
|
TLD_LENGTH: ${TLD_LENGTH}
|
||||||
|
SUPPORT_EMAIL: ${SUPPORT_EMAIL}
|
||||||
|
SMTP_AUTH: ${SMTP_AUTH}
|
||||||
|
SMTP_DOMAIN: ${SMTP_DOMAIN}
|
||||||
|
SMTP_SERVER: ${SMTP_SERVER}
|
||||||
|
SMTP_PORT: ${SMTP_PORT}
|
||||||
|
SMTP_USERNAME: ${SMTP_USERNAME}
|
||||||
|
SMTP_PASSWORD: ${SMTP_PASSWORD}
|
||||||
|
SMTP_USE_SSL: ${SMTP_USE_SSL}
|
||||||
|
REPLY_HOSTNAME: ${REPLY_HOSTNAME}
|
||||||
|
HELPER_BOT_EMAIL: ${HELPER_BOT_EMAIL}
|
||||||
|
RAILS_ENV: ${RAILS_ENV}
|
||||||
|
PUMA_WORKERS: ${PUMA_WORKERS}
|
||||||
|
MIN_THREADS: ${MIN_THREADS}
|
||||||
|
MAX_THREADS: ${MAX_THREADS}
|
||||||
|
FORCE_SSL: ${FORCE_SSL}
|
||||||
|
USE_RACK_ATTACK: ${USE_RACK_ATTACK}
|
||||||
|
DEVISE_SECRET: uuaYZNGgeKCMqGc5pPd3seNSrvKkVO9+pAu6JvrQI4M6T395m8dLJja5qza8HaHY
|
||||||
|
SECRET_COOKIE_TOKEN: uuaYZNGgeKCMqGc5pPd3seNSrvKkVO9+pAu6JvrQI4M6T395m8dLJja5qza8HaHY
|
||||||
|
SAML_APP_KEY:
|
||||||
|
SAML_IDP_METADATA_URL:
|
||||||
|
SAML_ISSUER:
|
||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: loomio/loomio:v2.7.10
|
image: loomio/loomio:v2.7.10
|
||||||
|
@ -14,30 +45,7 @@ services:
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
- redis
|
- redis
|
||||||
environment:
|
environment: *default-env
|
||||||
- DATABASE_URL=postgresql://postgres:password@db/loomio_production
|
|
||||||
- REDIS_URL=redis://redis:6379
|
|
||||||
- CANONICAL_HOST=${DOMAIN}
|
|
||||||
- CHANNELS_URI=wss://channels.${DOMAIN}
|
|
||||||
- TLD_LENGTH=${TLD_LENGTH}
|
|
||||||
- SUPPORT_EMAIL=${SUPPORT_EMAIL}
|
|
||||||
- SMTP_AUTH=${SMTP_AUTH}
|
|
||||||
- SMTP_DOMAIN=${SMTP_DOMAIN}
|
|
||||||
- SMTP_SERVER=${SMTP_SERVER}
|
|
||||||
- SMTP_PORT=${SMTP_PORT}
|
|
||||||
- SMTP_USERNAME=${SMTP_USERNAME}
|
|
||||||
- SMTP_PASSWORD=${SMTP_PASSWORD}
|
|
||||||
- SMTP_USE_SSL=${SMTP_USE_SSL}
|
|
||||||
- REPLY_HOSTNAME=${REPLY_HOSTNAME}
|
|
||||||
- HELPER_BOT_EMAIL=${HELPER_BOT_EMAIL}
|
|
||||||
- RAILS_ENV=${RAILS_ENV}
|
|
||||||
- PUMA_WORKERS=${PUMA_WORKERS}
|
|
||||||
- MIN_THREADS=${MIN_THREADS}
|
|
||||||
- MAX_THREADS=${MAX_THREADS}
|
|
||||||
- FORCE_SSL=${FORCE_SSL}
|
|
||||||
- USE_RACK_ATTACK=${USE_RACK_ATTACK}
|
|
||||||
- DEVISE_SECRET=uuaYZNGgeKCMqGc5pPd3seNSrvKkVO9+pAu6JvrQI4M6T395m8dLJja5qza8HaHY
|
|
||||||
- SECRET_COOKIE_TOKEN=uuaYZNGgeKCMqGc5pPd3seNSrvKkVO9+pAu6JvrQI4M6T395m8dLJja5qza8HaHY
|
|
||||||
deploy:
|
deploy:
|
||||||
restart_policy:
|
restart_policy:
|
||||||
condition: on-failure
|
condition: on-failure
|
||||||
|
@ -53,21 +61,13 @@ services:
|
||||||
networks:
|
networks:
|
||||||
- backend
|
- backend
|
||||||
environment:
|
environment:
|
||||||
- CANONICAL_HOST=${DOMAIN}
|
!!merge <<: *default-env
|
||||||
- DATABASE_URL=postgresql://postgres:password@db/loomio_production
|
TASK: worker
|
||||||
- REDIS_URL=redis://redis:6379
|
|
||||||
- TASK=worker
|
|
||||||
- DEVISE_SECRET=uuaYZNGgeKCMqGc5pPd3seNSrvKkVO9+pAu6JvrQI4M6T395m8dLJja5qza8HaHY
|
|
||||||
- SECRET_COOKIE_TOKEN=uuaYZNGgeKCMqGc5pPd3seNSrvKkVO9+pAu6JvrQI4M6T395m8dLJja5qza8HaHY
|
|
||||||
- RAILS_ENV=${RAILS_ENV}
|
|
||||||
volumes:
|
volumes:
|
||||||
- loomio_uploads:/loomio/public/system
|
- loomio_uploads:/loomio/public/system
|
||||||
- loomio_storage:/loomio/storage
|
- loomio_storage:/loomio/storage
|
||||||
- loomio_files:/loomio/public/files
|
- loomio_files:/loomio/public/files
|
||||||
- loomio_plugins:/loomio/plugins/docker
|
- loomio_plugins:/loomio/plugins/docker
|
||||||
deploy:
|
|
||||||
labels:
|
|
||||||
- coop-cloud.${STACK_NAME}.worker.version=v2.7.9-8007a47b
|
|
||||||
db:
|
db:
|
||||||
image: postgres:12.7
|
image: postgres:12.7
|
||||||
networks:
|
networks:
|
||||||
|
@ -79,16 +79,10 @@ services:
|
||||||
- POSTGRES_PASSWORD=password
|
- POSTGRES_PASSWORD=password
|
||||||
- POSTGRES_DB=loomio_production
|
- POSTGRES_DB=loomio_production
|
||||||
- PGDATA=/pgdata
|
- PGDATA=/pgdata
|
||||||
deploy:
|
|
||||||
labels:
|
|
||||||
- coop-cloud.${STACK_NAME}.db.version=12.2-d96835c9
|
|
||||||
redis:
|
redis:
|
||||||
image: redis:5.0
|
image: redis:5.0
|
||||||
networks:
|
networks:
|
||||||
- backend
|
- backend
|
||||||
deploy:
|
|
||||||
labels:
|
|
||||||
- coop-cloud.${STACK_NAME}.redis.version=5.0-3412d21e
|
|
||||||
#mailin:
|
#mailin:
|
||||||
# image: loomio/mailin-docker:latest
|
# image: loomio/mailin-docker:latest
|
||||||
# networks:
|
# networks:
|
||||||
|
@ -105,9 +99,6 @@ services:
|
||||||
- redis
|
- redis
|
||||||
environment:
|
environment:
|
||||||
- REDIS_URL=redis://redis:6379
|
- REDIS_URL=redis://redis:6379
|
||||||
deploy:
|
|
||||||
labels:
|
|
||||||
- coop-cloud.${STACK_NAME}.channels.version=loomio/loomio_channel_server-0f331ad6
|
|
||||||
networks:
|
networks:
|
||||||
backend:
|
backend:
|
||||||
proxy:
|
proxy:
|
||||||
|
|
Loading…
Reference in New Issue