diff options
author | Ben Lubar <ben.lubar+github@gmail.com> | 2019-12-12 02:41:52 -0600 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-12-12 09:41:52 +0100 |
commit | 72698686828b7b80a336d83fdbb1707e3b7a61fe (patch) | |
tree | 64b22b0189de86b54f361093ebc5c30204a59a80 | |
parent | c3340977343608838203d910bac77d4a59758274 (diff) | |
download | PeerTube-72698686828b7b80a336d83fdbb1707e3b7a61fe.tar.gz PeerTube-72698686828b7b80a336d83fdbb1707e3b7a61fe.tar.zst PeerTube-72698686828b7b80a336d83fdbb1707e3b7a61fe.zip |
Add support for HLS in the Docker container. (#2324)
* Add support for HLS in the Docker container.
* Remove comment from Dockerfile.stretch
-rw-r--r-- | support/docker/production/Dockerfile.stretch | 5 | ||||
-rw-r--r-- | support/docker/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 @@ | |||
1 | FROM node:10-stretch-slim | 1 | FROM node:10-buster-slim |
2 | 2 | ||
3 | # Allow to pass extra options to the npm run build | 3 | # Allow to pass extra options to the npm run build |
4 | # eg: --light --light-fr to not build all client languages | 4 | # eg: --light --light-fr to not build all client languages |
@@ -16,9 +16,8 @@ RUN groupadd -r peertube \ | |||
16 | && useradd -r -g peertube -m peertube | 16 | && useradd -r -g peertube -m peertube |
17 | 17 | ||
18 | # Install PeerTube | 18 | # Install PeerTube |
19 | COPY --chown=peertube:peertube . /app | ||
19 | WORKDIR /app | 20 | WORKDIR /app |
20 | COPY . ./ | ||
21 | RUN chown -R peertube:peertube /app | ||
22 | 21 | ||
23 | USER peertube | 22 | USER peertube |
24 | 23 | ||
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: | |||
103 | 720p: | 103 | 720p: |
104 | __name: "PEERTUBE_TRANSCODING_720P" | 104 | __name: "PEERTUBE_TRANSCODING_720P" |
105 | __format: "json" | 105 | __format: "json" |
106 | 1080: | 106 | 1080p: |
107 | __name: "PEERTUBE_TRANSCODING_1080P" | 107 | __name: "PEERTUBE_TRANSCODING_1080P" |
108 | __format: "json" | 108 | __format: "json" |
109 | 2160: | 109 | 2160p: |
110 | __name: "PEERTUBE_TRANSCODING_2160P" | 110 | __name: "PEERTUBE_TRANSCODING_2160P" |
111 | __format: "json" | 111 | __format: "json" |
112 | hls: | ||
113 | enabled: | ||
114 | __name: "PEERTUBE_TRANSCODING_HLS_ENABLED" | ||
115 | __format: "json" | ||
112 | 116 | ||
113 | instance: | 117 | instance: |
114 | name: "PEERTUBE_INSTANCE_NAME" | 118 | name: "PEERTUBE_INSTANCE_NAME" |