Add support for HLS in the Docker container. (#2324)

* Add support for HLS in the Docker container.

* Remove comment from Dockerfile.stretch

diff --git a/support/docker/production/Dockerfile.stretch b/support/docker/production/Dockerfile.stretch
index 720f266d376c0c0fadace17b01db84deeaaeed49..32c5266c5237e67fb65d1f288a096b5893efcf86 100644 (file)
--- a/support/docker/production/Dockerfile.stretch
+++ b/support/docker/production/Dockerfile.stretch
@@ -1,4 +1,4 @@
-FROM node:10-stretch-slim
+FROM node:10-buster-slim
 
 # Allow to pass extra options to the npm run build
 # eg: --light --light-fr to not build all client languages
@@ -16,9 +16,8 @@ RUN groupadd -r peertube \
     && useradd -r -g peertube -m peertube
 
 # Install PeerTube
+COPY --chown=peertube:peertube . /app
 WORKDIR /app
-COPY . ./
-RUN chown -R peertube:peertube /app
 
 USER peertube
 

diff --git a/support/docker/production/config/custom-environment-variables.yaml b/support/docker/production/config/custom-environment-variables.yaml
index d5b8788300e10e2fb32600606db58e5180e153c8..c4c62755171362e18f193ee597cfdfe13efe54e7 100644 (file)
--- a/support/docker/production/config/custom-environment-variables.yaml
+++ b/support/docker/production/config/custom-environment-variables.yaml
@@ -103,12 +103,16 @@ transcoding:
     720p:
       __name: "PEERTUBE_TRANSCODING_720P"
       __format: "json"
-    1080:
+    1080p:
       __name: "PEERTUBE_TRANSCODING_1080P"
       __format: "json"
-    2160:
+    2160p:
       __name: "PEERTUBE_TRANSCODING_2160P"
       __format: "json"
+  hls:
+    enabled:
+      __name: "PEERTUBE_TRANSCODING_HLS_ENABLED"
+      __format: "json"
 
 instance:
   name: "PEERTUBE_INSTANCE_NAME"