Add some missing envvars to docker-compose config (#9534)

publiclab · Apr 27, 2021 · fb890a7 · fb890a7
1 parent dbe0db5
commit fb890a7
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 1 deletion.
diff --git a/containers/docker-compose-production.yml b/containers/docker-compose-production.yml
@@ -85,6 +85,12 @@ services:
       - DB_PASS=${DB_PASS}
       - DB_HOST=${DB_HOST}
       - DB_SOCKET=${DB_SOCKET}
+      - SMTP_USER=${SMTP_USER}
+      - SMTP_PASS=${SMTP_PASS}
+      - SMTP_HOST=${SMTP_HOST}
+      - SMTP_PORT=${SMTP_PORT}
+      - SMTP_AUTH=${SMTP_AUTH}
+      - SMTP_STLS=${SMTP_STLS}
   mailman:
     build: ..
     command: script/mailman_server

diff --git a/containers/docker-compose-stable.yml b/containers/docker-compose-stable.yml
@@ -79,6 +79,17 @@ services:
       - RAILS_ENV=${RAILS_ENV}
       - REDIS_URL=redis://redis:6379/0
       - SECRET_KEY_BASE=${SECRET_KEY_BASE}
+      - DB_USER=${DB_USER}
+      - DB_NAME=${DB_NAME}
+      - DB_PASS=${DB_PASS}
+      - DB_HOST=${DB_HOST}
+      - DB_SOCKET=${DB_SOCKET}
+      - SMTP_USER=${SMTP_USER}
+      - SMTP_PASS=${SMTP_PASS}
+      - SMTP_HOST=${SMTP_HOST}
+      - SMTP_PORT=${SMTP_PORT}
+      - SMTP_AUTH=${SMTP_AUTH}
+      - SMTP_STLS=${SMTP_STLS}
   mailman:
     build: ..
     command: script/mailman_server
@@ -88,5 +99,10 @@ services:
       - SERVER_ADDRESS=${SERVER_ADDRESS}
       - USERNAME=${USERNAME}
       - EMAIL_PASSWORD=${EMAIL_PASSWORD}
+      - DB_USER=${DB_USER}
+      - DB_NAME=${DB_NAME}
+      - DB_PASS=${DB_PASS}
+      - DB_HOST=${DB_HOST}
+      - DB_SOCKET=${DB_SOCKET}
     volumes:
       - ..:/app
diff --git a/containers/docker-compose-testing.yml b/containers/docker-compose-testing.yml
@@ -64,5 +64,17 @@ services:
     volumes:
       - .:/app
     environment:
+      - RAILS_ENV=${RAILS_ENV}
       - REDIS_URL=redis://redis:6379/0
-
+      - SECRET_KEY_BASE=${SECRET_KEY_BASE}
+      - DB_USER=${DB_USER}
+      - DB_NAME=${DB_NAME}
+      - DB_PASS=${DB_PASS}
+      - DB_HOST=${DB_HOST}
+      - DB_SOCKET=${DB_SOCKET}
+      - SMTP_USER=${SMTP_USER}
+      - SMTP_PASS=${SMTP_PASS}
+      - SMTP_HOST=${SMTP_HOST}
+      - SMTP_PORT=${SMTP_PORT}
+      - SMTP_AUTH=${SMTP_AUTH}
+      - SMTP_STLS=${SMTP_STLS}
diff --git a/containers/docker-compose-unstable.yml b/containers/docker-compose-unstable.yml
@@ -79,6 +79,17 @@ services:
       - RAILS_ENV=${RAILS_ENV}
       - REDIS_URL=redis://redis:6379/0
       - SECRET_KEY_BASE=${SECRET_KEY_BASE}
+      - DB_USER=${DB_USER}
+      - DB_NAME=${DB_NAME}
+      - DB_PASS=${DB_PASS}
+      - DB_HOST=${DB_HOST}
+      - DB_SOCKET=${DB_SOCKET}
+      - SMTP_USER=${SMTP_USER}
+      - SMTP_PASS=${SMTP_PASS}
+      - SMTP_HOST=${SMTP_HOST}
+      - SMTP_PORT=${SMTP_PORT}
+      - SMTP_AUTH=${SMTP_AUTH}
+      - SMTP_STLS=${SMTP_STLS}
   mailman:
     build: ..
     command: script/mailman_server
@@ -88,5 +99,10 @@ services:
       - SERVER_ADDRESS=${SERVER_ADDRESS}
       - USERNAME=${USERNAME}
       - EMAIL_PASSWORD=${EMAIL_PASSWORD}
+      - DB_USER=${DB_USER}
+      - DB_NAME=${DB_NAME}
+      - DB_PASS=${DB_PASS}
+      - DB_HOST=${DB_HOST}
+      - DB_SOCKET=${DB_SOCKET}
     volumes:
       - ..:/app