Browse Source

new: [peertube] update to peertube v2.1.1

Signed-off-by: Valentin Lab <valentin.lab@kalysto.org>
dev
Valentin Lab 5 years ago
parent
commit
9833642678
  1. 7
      peertube/build/Dockerfile
  2. 16
      peertube/build/dbname.patch
  3. 2
      peertube/hooks/init

7
peertube/build/Dockerfile

@ -1,4 +1,4 @@
FROM alpine:3.7 AS common
FROM alpine:3.9 AS common
RUN apk add gnupg ffmpeg RUN apk add gnupg ffmpeg
@ -13,7 +13,7 @@ FROM common AS builder
## Download target release ## Download target release
## ##
ENV PEERTUBE_RELEASE=v1.1.0
ENV PEERTUBE_RELEASE=v2.1.1
RUN apk add wget RUN apk add wget
@ -34,9 +34,12 @@ RUN apk add git build-base python bash ## Build deps
RUN chown -R peertube:peertube /opt/apps/peertube RUN chown -R peertube:peertube /opt/apps/peertube
RUN apk add npm ## only needed to install things that should be in yarn
USER peertube USER peertube
RUN cd /opt/apps/peertube && \ RUN cd /opt/apps/peertube && \
npm install bcrypt && \
yarn install --production --pure-lockfile && \ yarn install --production --pure-lockfile && \
yarn cache clean yarn cache clean

16
peertube/build/dbname.patch

@ -1,21 +1,21 @@
diff --git a/dist/server/initializers/checker-before-init.js b/dist/server/initializers/checker-before-init.js diff --git a/dist/server/initializers/checker-before-init.js b/dist/server/initializers/checker-before-init.js
index 7ff18d0..c75dff2 100644
index d8422ee..5eb3678 100644
--- a/dist/server/initializers/checker-before-init.js --- a/dist/server/initializers/checker-before-init.js
+++ b/dist/server/initializers/checker-before-init.js +++ b/dist/server/initializers/checker-before-init.js
@@ -15,7 +15,7 @@ function checkMissedConfig() {
@@ -16,7 +16,7 @@ function checkMissedConfig() {
const required = ['listen.port', 'listen.hostname', const required = ['listen.port', 'listen.hostname',
'webserver.https', 'webserver.hostname', 'webserver.port', 'webserver.https', 'webserver.hostname', 'webserver.port',
'trust_proxy', 'trust_proxy',
- 'database.hostname', 'database.port', 'database.suffix', 'database.username', 'database.password', 'database.pool.max', - 'database.hostname', 'database.port', 'database.suffix', 'database.username', 'database.password', 'database.pool.max',
+ 'database.hostname', 'database.port', 'database.dbname', 'database.username', 'database.password', 'database.pool.max', + 'database.hostname', 'database.port', 'database.dbname', 'database.username', 'database.password', 'database.pool.max',
'smtp.hostname', 'smtp.port', 'smtp.username', 'smtp.password', 'smtp.tls', 'smtp.from_address', 'smtp.hostname', 'smtp.port', 'smtp.username', 'smtp.password', 'smtp.tls', 'smtp.from_address',
'email.body.signature', 'email.subject.prefix',
'storage.avatars', 'storage.videos', 'storage.logs', 'storage.previews', 'storage.thumbnails', 'storage.torrents', 'storage.cache', 'storage.avatars', 'storage.videos', 'storage.logs', 'storage.previews', 'storage.thumbnails', 'storage.torrents', 'storage.cache',
'log.level',
diff --git a/dist/server/initializers/constants.js b/dist/server/initializers/constants.js
index d5a3350..7efaabd 100644
--- a/dist/server/initializers/constants.js
+++ b/dist/server/initializers/constants.js
@@ -143,7 +143,7 @@ const CONFIG = {
diff --git a/dist/server/initializers/config.js b/dist/server/initializers/config.js
index 6aa916f..89d16fe 100644
--- a/dist/server/initializers/config.js
+++ b/dist/server/initializers/config.js
@@ -12,7 +12,7 @@ const CONFIG = {
HOSTNAME: config.get('listen.hostname') HOSTNAME: config.get('listen.hostname')
}, },
DATABASE: { DATABASE: {

2
peertube/hooks/init

@ -66,7 +66,7 @@ for section in "${VALID_SECTION[@]}"; do
done >> "$HOST_CONFIG_DIR/local.yaml" done >> "$HOST_CONFIG_DIR/local.yaml"
if ! [ -e "$HOST_DATA_DIR/config.json" ]; then if ! [ -e "$HOST_DATA_DIR/config.json" ]; then
touch "$HOST_DATA_DIR/config.json"
echo "{}" > "$HOST_DATA_DIR/config.json"
fi fi
ln -sf "$PEERTUBE_DATA_DIR"/config.json "$HOST_CONFIG_DIR/local-prod.json" ln -sf "$PEERTUBE_DATA_DIR"/config.json "$HOST_CONFIG_DIR/local-prod.json"

Loading…
Cancel
Save