diff --git a/server/helpers/custom-validators/activitypub/videos.ts b/server/helpers/custom-validators/activitypub/videos.ts index 3af587a32..d8986b2a0 100644 --- a/server/helpers/custom-validators/activitypub/videos.ts +++ b/server/helpers/custom-validators/activitypub/videos.ts @@ -57,7 +57,7 @@ function isVideoTorrentObjectValid (video: any) { isBooleanValid(video.commentsEnabled) && isDateValid(video.published) && isDateValid(video.updated) && - setTruncatedContent(video) && + setRemoteVideoTruncatedContent(video) && (!video.content || isRemoteVideoContentValid(video.mediaType, video.content)) && isRemoteVideoIconValid(video.icon) && setValidRemoteVideoUrls(video) && @@ -113,7 +113,7 @@ function setValidRemoteVideoUrls (video: any) { return true } -function setTruncatedContent (video: any) { +function setRemoteVideoTruncatedContent (video: any) { if (video.content) { video.content = peertubeTruncate(video.content, CONSTRAINTS_FIELDS.VIDEOS.TRUNCATED_DESCRIPTION.max) } diff --git a/support/docker/production/Dockerfile.alpine b/support/docker/production/Dockerfile.alpine deleted file mode 100644 index 58a49d4a0..000000000 --- a/support/docker/production/Dockerfile.alpine +++ /dev/null @@ -1,30 +0,0 @@ -FROM node:8-alpine - -# Install dependencies -RUN apk add --no-cache ffmpeg openssl bash make g++ git \ - && apk add --no-cache --repository https://dl-3.alpinelinux.org/alpine/edge/testing/ vips-dev fftw-dev - -# Add peertube user -RUN addgroup -g 991 peertube \ - && adduser -D -u 991 -G peertube peertube - -# Download the latest version -RUN git clone https://github.com/Chocobozzz/PeerTube /app \ - && chown -R peertube:peertube /app - -# Install PeerTube -USER peertube -WORKDIR /app - -RUN yarn install --pure-lockfile \ - && npm run build - -# Configure PeerTube -RUN cp /app/config/default.yaml /app/support/docker/production/config/default.yaml -ENV NODE_ENV production -ENV NODE_CONFIG_DIR /app/support/docker/production/config - -# Run the application -CMD ["npm", "start"] -VOLUME ["/data"] -EXPOSE 9000 diff --git a/support/docker/production/docker-compose.yml b/support/docker/production/docker-compose.yml index d45b0b51a..94dbb68c5 100644 --- a/support/docker/production/docker-compose.yml +++ b/support/docker/production/docker-compose.yml @@ -6,7 +6,7 @@ services: build: context: . dockerfile: ./Dockerfile.stretch - image: peertube:stretch + image: chocobozzz/peertube:stretch environment: PEERTUBE_HOSTNAME: my.domain.tld PEERTUBE_PORT: 443