From 95540ed23a2e6ae6d48739f211aa24df57278413 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 23 Mar 2018 11:22:26 +0100 Subject: Prepare building docker files on docker hub --- config/production.yaml.example | 3 ++ support/docker/production/Dockerfile.alpine | 6 +-- support/docker/production/Dockerfile.stretch | 6 +-- support/docker/production/config/production.yaml | 50 +----------------------- support/docker/production/docker-compose.yml | 6 +-- 5 files changed, 13 insertions(+), 58 deletions(-) diff --git a/config/production.yaml.example b/config/production.yaml.example index 43f45ae80..43cacee3b 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example @@ -15,11 +15,13 @@ database: username: 'peertube' password: 'peertube' +# Redis server for short time storage redis: hostname: 'localhost' port: 6379 auth: null +# SMTP server to send emails smtp: hostname: null port: 465 @@ -84,6 +86,7 @@ transcoding: 720p: false 1080p: false +# Instance settings instance: name: 'PeerTube' short_description: 'PeerTube, a federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular.' diff --git a/support/docker/production/Dockerfile.alpine b/support/docker/production/Dockerfile.alpine index 939b2d23b..8ce0bb98b 100644 --- a/support/docker/production/Dockerfile.alpine +++ b/support/docker/production/Dockerfile.alpine @@ -4,10 +4,9 @@ FROM node:8-alpine 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 -# Install the application -WORKDIR /app +RUN git clone -b master https://github.com/Chocobozzz/PeerTube /app -COPY . ./ +WORKDIR /app RUN bash -c 'yarn install --pure-lockfile && npm run build' # Configure the application @@ -15,6 +14,7 @@ RUN addgroup -g 991 peertube \ && adduser -D -u 991 -G peertube -h /data peertube USER 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/ diff --git a/support/docker/production/Dockerfile.stretch b/support/docker/production/Dockerfile.stretch index c739247a6..c616194e6 100644 --- a/support/docker/production/Dockerfile.stretch +++ b/support/docker/production/Dockerfile.stretch @@ -5,10 +5,9 @@ RUN apt-get update \ && apt-get -y install ffmpeg \ && rm /var/lib/apt/lists/* -fR -# Install the application -WORKDIR /app +RUN git clone -b master https://github.com/Chocobozzz/PeerTube /app -COPY . ./ +WORKDIR /app RUN yarn install --pure-lockfile && npm run build # Configure the application @@ -16,6 +15,7 @@ RUN groupadd -g 991 peertube \ && useradd -u 991 -g peertube -d /data -m peertube USER 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 diff --git a/support/docker/production/config/production.yaml b/support/docker/production/config/production.yaml index fdcbeb5a0..41272ba26 100644 --- a/support/docker/production/config/production.yaml +++ b/support/docker/production/config/production.yaml @@ -21,21 +21,9 @@ redis: port: 6379 auth: null -# SMTP server to send emails -smtp: - hostname: null - port: 465 - username: null - password: null - tls: true - disable_starttls: false - ca_file: null # Used for self signed certificates - from_address: 'admin@example.com' - # From the project root directory storage: avatars: '../data/avatars/' - certs: '../data/certs/' videos: '../data/videos/' logs: '../data/logs/' previews: '../data/previews/' @@ -46,41 +34,5 @@ storage: log: level: 'info' # debug/info/warning/error -cache: - previews: - size: 100 # Max number of previews you want to cache - admin: - email: undefined - -signup: - enabled: false - limit: -1 - -user: - # Default value of maximum video BYTES the user can upload (does not take into account transcoded files). - # -1 == unlimited - video_quota: -1 - -# If enabled, the video will be transcoded to mp4 (x264) with "faststart" flag -# Uses a lot of CPU! -transcoding: - enabled: false - threads: 2 - resolutions: # Only created if the original video has a higher resolution - 240p: true - 360p: true - 480p: true - 720p: true - 1080p: true - -# Instance settings -instance: - name: 'PeerTube' - short_description: 'PeerTube, a federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular.' - description: '' # Support markdown - terms: '' # Support markdown - default_client_route: '/videos/trending' - customizations: - javascript: '' # Directly your JavaScript code (without