From 0d70ef6838e9cfcdeeb8c5acf6d5951a5e407212 Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Mon, 27 Dec 2021 17:45:58 +0200
Subject: [PATCH] Reuse env vars, fix worker config, remove cruft

---
 compose.yml | 77 +++++++++++++++++++++++------------------------------
 1 file changed, 34 insertions(+), 43 deletions(-)

diff --git a/compose.yml b/compose.yml
index eabf622..725d7fa 100644
--- a/compose.yml
+++ b/compose.yml
@@ -1,4 +1,35 @@
+---
 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:
   app:
     image: loomio/loomio:v2.7.10
@@ -14,30 +45,7 @@ services:
     depends_on:
       - db
       - redis
-    environment:
-      - 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
+    environment: *default-env
     deploy:
       restart_policy:
         condition: on-failure
@@ -53,21 +61,13 @@ services:
     networks:
       - backend
     environment:
-      - CANONICAL_HOST=${DOMAIN}
-      - DATABASE_URL=postgresql://postgres:password@db/loomio_production
-      - REDIS_URL=redis://redis:6379
-      - TASK=worker
-      - DEVISE_SECRET=uuaYZNGgeKCMqGc5pPd3seNSrvKkVO9+pAu6JvrQI4M6T395m8dLJja5qza8HaHY
-      - SECRET_COOKIE_TOKEN=uuaYZNGgeKCMqGc5pPd3seNSrvKkVO9+pAu6JvrQI4M6T395m8dLJja5qza8HaHY
-      - RAILS_ENV=${RAILS_ENV}
+      !!merge <<: *default-env
+      TASK: worker
     volumes:
       - loomio_uploads:/loomio/public/system
       - loomio_storage:/loomio/storage
       - loomio_files:/loomio/public/files
       - loomio_plugins:/loomio/plugins/docker
-    deploy:
-      labels:
-        - coop-cloud.${STACK_NAME}.worker.version=v2.7.9-8007a47b
   db:
     image: postgres:12.7
     networks:
@@ -79,16 +79,10 @@ services:
       - POSTGRES_PASSWORD=password
       - POSTGRES_DB=loomio_production
       - PGDATA=/pgdata
-    deploy:
-      labels:
-        - coop-cloud.${STACK_NAME}.db.version=12.2-d96835c9
   redis:
     image: redis:5.0
     networks:
       - backend
-    deploy:
-      labels:
-        - coop-cloud.${STACK_NAME}.redis.version=5.0-3412d21e
   #mailin:
   #  image: loomio/mailin-docker:latest
   #  networks:
@@ -105,9 +99,6 @@ services:
       - redis
     environment:
       - REDIS_URL=redis://redis:6379
-    deploy:
-      labels:
-        - coop-cloud.${STACK_NAME}.channels.version=loomio/loomio_channel_server-0f331ad6
 networks:
   backend:
   proxy: