[docker] Update production guidelines and docker-compose file; (#341)

3 files changed, 34 insertions, 13 deletions

diff --git a/support/docker/production/config/custom-environment-variables.yaml b/support/docker/production/config/custom-environment-variables.yaml
index 9139125a5..b53405c46 100644
--- a/support/docker/production/config/custom-environment-variables.yaml
+++ b/support/docker/production/config/custom-environment-variables.yaml
@@ -33,7 +33,7 @@ smtp:
   tls:
     __name: "PEERTUBE_SMTP_TLS"
     __format: "json"
-  form_address: "PEERTUBE_ADMIN_EMAIL"
+  from_address: "PEERTUBE_SMTP_FROM"
 
 admin:
   email: "PEERTUBE_ADMIN_EMAIL"
diff --git a/support/docker/production/config/production.yaml b/support/docker/production/config/production.yaml
index 3cc72e573..c00cf7510 100644
--- a/support/docker/production/config/production.yaml
+++ b/support/docker/production/config/production.yaml
@@ -78,3 +78,7 @@ instance:
   name: 'PeerTube'
   description: '' # Support markdown
   terms: '' # Support markdown
+  default_client_route: '/videos/trending'
+  customizations:
+    javascript: '' # Directly your JavaScript code (without <script> tags). Will be eval at runtime
+    css: '' # Directly your CSS code (without <style> tags). Will be injected at runtime
diff --git a/support/docker/production/docker-compose.yml b/support/docker/production/docker-compose.yml
index db1c7d587..b08cace76 100644
--- a/support/docker/production/docker-compose.yml
+++ b/support/docker/production/docker-compose.yml
@@ -1,19 +1,27 @@
 version: "3.3"
 
 services:
-  peertube:
 
-    build: .
+  peertube:
+    build:
+      context: ../../../
+      dockerfile: ./support/docker/production/Dockerfile.stretch
     image: peertube:stretch
     environment:
       PEERTUBE_HOSTNAME: my.domain.tld
       PEERTUBE_PORT: 443
-      PEERTUBE_HTTPS: true
+      PEERTUBE_HTTPS: "true"
       PEERTUBE_ADMIN_EMAIL: admin@domain.tld
-      PEERTUBE_DB_USERNAME: user
-      PEERTUBE_DB_PASSWORD: password
-      PEERTUBE_SIGNUP_ENABLED: true
-      PEERTUBE_TRANSCODING_ENABLED: true
+      PEERTUBE_DB_HOSTNAME: postgres
+      PEERTUBE_DB_USERNAME: postgres_user
+      PEERTUBE_DB_PASSWORD: postgres_password
+      PEERTUBE_SIGNUP_ENABLED: "true"
+      PEERTUBE_TRANSCODING_ENABLED: "true"
+      PEERTUBE_REDIS_HOSTNAME: redis
+      PEERTUBE_SMTP_HOSTNAME: mail.domain.tld
+      PEERTUBE_SMTP_PORT: 25
+      PEERTUBE_SMTP_FROM: noreply@peertube.domain.tld
+      PEERTUBE_SMTP_TLS: "true"
     # Traefik labels are suggested as an example for people using Traefik,
     # remove them if you are using another reverse proxy.
     labels:
@@ -23,13 +31,22 @@ services:
     volumes:
       - ./data:/usr/src/app/data
     depends_on:
-      - db
+      - postgres
+      - redis
+    restart: "always"
 
-  db:
+  postgres:
     image: postgres:10
     environment:
-      POSTGRES_USERNAME: user
-      POSTGRES_PASSWORD: password
-      POSTGRES_DB: peertube_prod
+      POSTGRES_USER: postgres_user
+      POSTGRES_PASSWORD: postgres_password
+      POSTGRES_DB: peertube
     volumes:
       - ./db:/var/lib/postgresql/data
+    restart: "always"
+
+  redis:
+    image: redis
+    volumes:
+      - ./redis:/data
+    restart: "always"