interesting
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove alpine image

This commit is contained in:
Chocobozzz 2018-03-28 13:45:24 +02:00
parent 829be6e8b7
commit 45cd28b679
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
3 changed files with 3 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/helpers/custom-validators/activitypub/videos.ts
View File

@ -57,7 +57,7 @@ function isVideoTorrentObjectValid (video: any) {
isBooleanValid(video.commentsEnabled) && isBooleanValid(video.commentsEnabled) &&
isDateValid(video.published) && isDateValid(video.published) &&
isDateValid(video.updated) && isDateValid(video.updated) &&
setTruncatedContent(video) && setRemoteVideoTruncatedContent(video) &&
(!video.content || isRemoteVideoContentValid(video.mediaType, video.content)) && (!video.content || isRemoteVideoContentValid(video.mediaType, video.content)) &&
isRemoteVideoIconValid(video.icon) && isRemoteVideoIconValid(video.icon) &&
setValidRemoteVideoUrls(video) && setValidRemoteVideoUrls(video) &&
@ -113,7 +113,7 @@ function setValidRemoteVideoUrls (video: any) {
return true return true
} }
function setTruncatedContent (video: any) { function setRemoteVideoTruncatedContent (video: any) {
if (video.content) { if (video.content) {
video.content = peertubeTruncate(video.content, CONSTRAINTS_FIELDS.VIDEOS.TRUNCATED_DESCRIPTION.max) video.content = peertubeTruncate(video.content, CONSTRAINTS_FIELDS.VIDEOS.TRUNCATED_DESCRIPTION.max)
} }

30
support/docker/production/Dockerfile.alpine
View File

@ -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

2
support/docker/production/docker-compose.yml
View File

@ -6,7 +6,7 @@ services:
build: build:
context: . context: .
dockerfile: ./Dockerfile.stretch dockerfile: ./Dockerfile.stretch
image: peertube:stretch image: chocobozzz/peertube:stretch
environment: environment:
PEERTUBE_HOSTNAME: my.domain.tld PEERTUBE_HOSTNAME: my.domain.tld
PEERTUBE_PORT: 443 PEERTUBE_PORT: 443