From 72698686828b7b80a336d83fdbb1707e3b7a61fe Mon Sep 17 00:00:00 2001 From: Ben Lubar Date: Thu, 12 Dec 2019 02:41:52 -0600 Subject: [PATCH] Add support for HLS in the Docker container. (#2324) * Add support for HLS in the Docker container. * Remove comment from Dockerfile.stretch --- support/docker/production/Dockerfile.stretch | 5 ++--- .../production/config/custom-environment-variables.yaml | 8 ++++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/support/docker/production/Dockerfile.stretch b/support/docker/production/Dockerfile.stretch index 720f266d3..32c5266c5 100644 --- 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 d5b878830..c4c627551 100644 --- 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" -- 2.41.0