Merge branch 'release/2.2.0' into develop

[github/Chocobozzz/PeerTube.git] / support / docker / production / docker-compose.yml

diff --git a/support/docker/production/docker-compose.yml b/support/docker/production/docker-compose.yml
index 9f6c47eca388178d53868b94b8c994287b6c6c7c..e937c8b9c13535bcdf345f5b46867cfbb391448b 100644 (file)
--- a/support/docker/production/docker-compose.yml
+++ b/support/docker/production/docker-compose.yml
@@ -5,7 +5,10 @@ services:
   reverse-proxy:
     image: traefik:v1.7
     network_mode: "host"
-    command: --docker # Tells Træfik to listen to docker
+    command:
+      - "--docker" # Tells Træfik to listen to docker
+      - "--acme.email=${TRAEFIK_ACME_EMAIL}" # Let's Encrypt ACME email
+      - "--acme.domains=${TRAEFIK_ACME_DOMAINS}" # Let's Encrypt ACME domain list
     ports:
       - "80:80"     # The HTTP port
       - "443:443"   # The HTTPS port
@@ -23,8 +26,8 @@ services:
     # If you don't want to use the official image and build one from sources
     # build:
     #   context: .
-    #   dockerfile: ./support/docker/production/Dockerfile.stretch
-    image: chocobozzz/peertube:production-stretch
+    #   dockerfile: ./support/docker/production/Dockerfile.buster
+    image: chocobozzz/peertube:production-buster
     env_file:
       - .env
     # Traefik labels are suggested as an example for people using Traefik,
@@ -67,6 +70,8 @@ services:
     image: mwader/postfix-relay
     env_file:
       - .env
+    volumes:
+      - ./docker-volume/opendkim/keys:/etc/opendkim/keys
     labels:
       traefik.enable: "false"
     restart: "always"