1 files changed, 27 insertions, 13 deletions

diff --git a/support/docker/production/docker-compose.yml b/support/docker/production/docker-compose.yml
index bce9426d2..4ad1a8756 100644
--- a/support/docker/production/docker-compose.yml
+++ b/support/docker/production/docker-compose.yml
@@ -2,19 +2,18 @@ version: "3.3"
 
 services:
 
-  # The webserver is not required, but recommended since a lot of optimizations went to its
-  # nginx configuration file. It runs the default nginx configuration without HTTPS nor SSL,
-  # so use it in production in tandem with an SSL-terminating reverse-proxy.
+  # You can comment this webserver section if you want to use another webserver/proxy
   webserver:
-    image: chocobozzz/peertube:webserver
-    build:
-      context: .
-      dockerfile: Dockerfile.nginx
+    image: chocobozzz/peertube-webserver:latest
+    # If you don't want to use the official image and build one from sources:
+    # build:
+    #   context: .
+    #   dockerfile: Dockerfile.nginx
     env_file:
       - .env
-    # If you provide your own reverse-proxy, otherwise not suitable for production:
-    #ports:
-    #  - "9000:80" # serving HTTP
+    ports:
+     - "80:80"
+     - "443:443"
     volumes:
       - type: bind
         # Switch sources if you downloaded the whole repository
@@ -23,15 +22,29 @@ services:
         target: /etc/nginx/conf.d/peertube.template
       - assets:/var/www/peertube/peertube-latest/client/dist:ro
       - ./docker-volume/data:/var/www/peertube/storage
+      - certbot-www:/var/www/certbot
+      - ./docker-volume/certbot/conf:/etc/letsencrypt
     depends_on:
       - peertube
     restart: "always"
 
+  # You can comment this certbot section if you want to use another webserver/proxy
+  certbot:
+    container_name: certbot
+    image: certbot/certbot
+    volumes:
+      - ./docker-volume/certbot/conf:/etc/letsencrypt
+      - certbot-www:/var/www/certbot
+    restart: unless-stopped
+    entrypoint: /bin/sh -c "trap exit TERM; while :; do certbot renew --webroot -w /var/www/certbot; sleep 12h & wait $${!}; done;"
+    depends_on:
+      - webserver
+
   peertube:
     # If you don't want to use the official image and build one from sources:
-    #build:
-    #  context: .
-    #  dockerfile: ./support/docker/production/Dockerfile.buster
+    # build:
+    #   context: .
+    #   dockerfile: ./support/docker/production/Dockerfile.buster
     image: chocobozzz/peertube:production-buster
     env_file:
       - .env
@@ -79,3 +92,4 @@ networks:
 
 volumes:
   assets:
+  certbot-www: