From a30995fc27e697359d195e5c03127034d9c4e7ca Mon Sep 17 00:00:00 2001
From: Rigel Kent <sendmemail@rigelk.eu>
Date: Wed, 11 Nov 2020 12:55:13 +0100
Subject: consistent documentation and configuration in compose file

---
 support/docker/production/docker-compose.yml  | 11 ++++++-----
 support/docker/production/entrypoint.nginx.sh |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'support/docker')

diff --git a/support/docker/production/docker-compose.yml b/support/docker/production/docker-compose.yml
index d17dbd0df..bce9426d2 100644
--- a/support/docker/production/docker-compose.yml
+++ b/support/docker/production/docker-compose.yml
@@ -6,6 +6,7 @@ services:
   # 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.
   webserver:
+    image: chocobozzz/peertube:webserver
     build:
       context: .
       dockerfile: Dockerfile.nginx
@@ -16,9 +17,9 @@ services:
     #  - "9000:80" # serving HTTP
     volumes:
       - type: bind
-        # Switch sources if you downloaded the nginx configuration without the whole repository
-        #source: ./peertube
-        source: ../../nginx/peertube
+        # Switch sources if you downloaded the whole repository
+        #source: ../../nginx/peertube
+        source: ./docker-volume/nginx/peertube
         target: /etc/nginx/conf.d/peertube.template
       - assets:/var/www/peertube/peertube-latest/client/dist:ro
       - ./docker-volume/data:/var/www/peertube/storage
@@ -48,7 +49,7 @@ services:
     restart: "always"
 
   postgres:
-    image: postgres:10-alpine
+    image: postgres:13-alpine
     env_file:
       - .env
     volumes:
@@ -56,7 +57,7 @@ services:
     restart: "always"
 
   redis:
-    image: redis:5-alpine
+    image: redis:6-alpine
     volumes:
       - ./docker-volume/redis:/data
     restart: "always"
diff --git a/support/docker/production/entrypoint.nginx.sh b/support/docker/production/entrypoint.nginx.sh
index 4d2ead966..670ce84a3 100644
--- a/support/docker/production/entrypoint.nginx.sh
+++ b/support/docker/production/entrypoint.nginx.sh
@@ -9,7 +9,7 @@ export PEERTUBE_HOST="peertube:9000"
 
 envsubst '${WEBSERVER_HOST} ${PEERTUBE_HOST}' < $SOURCE_FILE > $TARGET_FILE
 
-# Remove HTTPS/SSL from nginx conf
+# Remove HTTPS/SSL from nginx conf since this image is meant as a webserver _behind_ a reverse-proxy doing TLS termination itself
 sed -i 's/443 ssl http2/80/g;/ssl_/d' $TARGET_FILE
 
 nginx -g "daemon off;"
\ No newline at end of file
-- 
cgit v1.2.3