aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-03-28 13:45:24 +0200
committerChocobozzz <me@florianbigard.com>2018-03-28 13:45:24 +0200
commit45cd28b679d3472392ed5d77dcfd8f442d1565bf (patch)
tree685a2b74035000b4bba955d290d0c27190b48451
parent829be6e8b7e9a09f118577745906c19926c20416 (diff)
downloadPeerTube-45cd28b679d3472392ed5d77dcfd8f442d1565bf.tar.gz
PeerTube-45cd28b679d3472392ed5d77dcfd8f442d1565bf.tar.zst
PeerTube-45cd28b679d3472392ed5d77dcfd8f442d1565bf.zip
Remove alpine image
-rw-r--r--server/helpers/custom-validators/activitypub/videos.ts4
-rw-r--r--support/docker/production/Dockerfile.alpine30
-rw-r--r--support/docker/production/docker-compose.yml2
3 files changed, 3 insertions, 33 deletions
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) {
57 isBooleanValid(video.commentsEnabled) && 57 isBooleanValid(video.commentsEnabled) &&
58 isDateValid(video.published) && 58 isDateValid(video.published) &&
59 isDateValid(video.updated) && 59 isDateValid(video.updated) &&
60 setTruncatedContent(video) && 60 setRemoteVideoTruncatedContent(video) &&
61 (!video.content || isRemoteVideoContentValid(video.mediaType, video.content)) && 61 (!video.content || isRemoteVideoContentValid(video.mediaType, video.content)) &&
62 isRemoteVideoIconValid(video.icon) && 62 isRemoteVideoIconValid(video.icon) &&
63 setValidRemoteVideoUrls(video) && 63 setValidRemoteVideoUrls(video) &&
@@ -113,7 +113,7 @@ function setValidRemoteVideoUrls (video: any) {
113 return true 113 return true
114} 114}
115 115
116function setTruncatedContent (video: any) { 116function setRemoteVideoTruncatedContent (video: any) {
117 if (video.content) { 117 if (video.content) {
118 video.content = peertubeTruncate(video.content, CONSTRAINTS_FIELDS.VIDEOS.TRUNCATED_DESCRIPTION.max) 118 video.content = peertubeTruncate(video.content, CONSTRAINTS_FIELDS.VIDEOS.TRUNCATED_DESCRIPTION.max)
119 } 119 }
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 @@
1FROM node:8-alpine
2
3# Install dependencies
4RUN apk add --no-cache ffmpeg openssl bash make g++ git \
5 && apk add --no-cache --repository https://dl-3.alpinelinux.org/alpine/edge/testing/ vips-dev fftw-dev
6
7# Add peertube user
8RUN addgroup -g 991 peertube \
9 && adduser -D -u 991 -G peertube peertube
10
11# Download the latest version
12RUN git clone https://github.com/Chocobozzz/PeerTube /app \
13 && chown -R peertube:peertube /app
14
15# Install PeerTube
16USER peertube
17WORKDIR /app
18
19RUN yarn install --pure-lockfile \
20 && npm run build
21
22# Configure PeerTube
23RUN cp /app/config/default.yaml /app/support/docker/production/config/default.yaml
24ENV NODE_ENV production
25ENV NODE_CONFIG_DIR /app/support/docker/production/config
26
27# Run the application
28CMD ["npm", "start"]
29VOLUME ["/data"]
30EXPOSE 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:
6 build: 6 build:
7 context: . 7 context: .
8 dockerfile: ./Dockerfile.stretch 8 dockerfile: ./Dockerfile.stretch
9 image: peertube:stretch 9 image: chocobozzz/peertube:stretch
10 environment: 10 environment:
11 PEERTUBE_HOSTNAME: my.domain.tld 11 PEERTUBE_HOSTNAME: my.domain.tld
12 PEERTUBE_PORT: 443 12 PEERTUBE_PORT: 443