aboutsummaryrefslogtreecommitdiffhomepage
path: root/support/docker
diff options
context:
space:
mode:
authorRigel Kent <sendmemail@rigelk.eu>2020-11-11 12:55:13 +0100
committerRigel Kent <sendmemail@rigelk.eu>2020-11-11 16:45:46 +0100
commita30995fc27e697359d195e5c03127034d9c4e7ca (patch)
treeeee5b6d4984dac07c6641d628fe54536130d9119 /support/docker
parentb8f3e6b00b3300f4ebf37bf77711739964c9e5d6 (diff)
downloadPeerTube-a30995fc27e697359d195e5c03127034d9c4e7ca.tar.gz
PeerTube-a30995fc27e697359d195e5c03127034d9c4e7ca.tar.zst
PeerTube-a30995fc27e697359d195e5c03127034d9c4e7ca.zip
consistent documentation and configuration in compose file
Diffstat (limited to 'support/docker')
-rw-r--r--support/docker/production/docker-compose.yml11
-rw-r--r--support/docker/production/entrypoint.nginx.sh2
2 files changed, 7 insertions, 6 deletions
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:
6 # nginx configuration file. It runs the default nginx configuration without HTTPS nor SSL, 6 # nginx configuration file. It runs the default nginx configuration without HTTPS nor SSL,
7 # so use it in production in tandem with an SSL-terminating reverse-proxy. 7 # so use it in production in tandem with an SSL-terminating reverse-proxy.
8 webserver: 8 webserver:
9 image: chocobozzz/peertube:webserver
9 build: 10 build:
10 context: . 11 context: .
11 dockerfile: Dockerfile.nginx 12 dockerfile: Dockerfile.nginx
@@ -16,9 +17,9 @@ services:
16 # - "9000:80" # serving HTTP 17 # - "9000:80" # serving HTTP
17 volumes: 18 volumes:
18 - type: bind 19 - type: bind
19 # Switch sources if you downloaded the nginx configuration without the whole repository 20 # Switch sources if you downloaded the whole repository
20 #source: ./peertube 21 #source: ../../nginx/peertube
21 source: ../../nginx/peertube 22 source: ./docker-volume/nginx/peertube
22 target: /etc/nginx/conf.d/peertube.template 23 target: /etc/nginx/conf.d/peertube.template
23 - assets:/var/www/peertube/peertube-latest/client/dist:ro 24 - assets:/var/www/peertube/peertube-latest/client/dist:ro
24 - ./docker-volume/data:/var/www/peertube/storage 25 - ./docker-volume/data:/var/www/peertube/storage
@@ -48,7 +49,7 @@ services:
48 restart: "always" 49 restart: "always"
49 50
50 postgres: 51 postgres:
51 image: postgres:10-alpine 52 image: postgres:13-alpine
52 env_file: 53 env_file:
53 - .env 54 - .env
54 volumes: 55 volumes:
@@ -56,7 +57,7 @@ services:
56 restart: "always" 57 restart: "always"
57 58
58 redis: 59 redis:
59 image: redis:5-alpine 60 image: redis:6-alpine
60 volumes: 61 volumes:
61 - ./docker-volume/redis:/data 62 - ./docker-volume/redis:/data
62 restart: "always" 63 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"
9 9
10envsubst '${WEBSERVER_HOST} ${PEERTUBE_HOST}' < $SOURCE_FILE > $TARGET_FILE 10envsubst '${WEBSERVER_HOST} ${PEERTUBE_HOST}' < $SOURCE_FILE > $TARGET_FILE
11 11
12# Remove HTTPS/SSL from nginx conf 12# Remove HTTPS/SSL from nginx conf since this image is meant as a webserver _behind_ a reverse-proxy doing TLS termination itself
13sed -i 's/443 ssl http2/80/g;/ssl_/d' $TARGET_FILE 13sed -i 's/443 ssl http2/80/g;/ssl_/d' $TARGET_FILE
14 14
15nginx -g "daemon off;" \ No newline at end of file 15nginx -g "daemon off;" \ No newline at end of file