Commit Graph

152 Commits

Author SHA1 Message Date
Jan Keromnes ef62d58674 Fix PostreSQL initialization for Gitpod 2020-12-06 13:58:00 +01:00
Jan Keromnes 387d041b7a
Trigger a Gitpod dev image rebuild (in order to get upstream's Node.js 12 upgrade) (#3388)
* Trigger a Gitpod dev image rebuild (in order to get upstream's Node.js 12 upgrade)

* Update Dockerfile
2020-12-02 11:03:03 +01:00
Rigel Kent 08d70fe606
export rtmp port in dockerfiles
follows #3341
2020-11-21 17:32:56 +01:00
Rigel Kent a30995fc27
consistent documentation and configuration in compose file 2020-11-11 16:45:46 +01:00
Rigel Kent b8f3e6b00b
move traefik to its own override file 2020-11-11 16:45:46 +01:00
Rigel Kent e604efcb71
Do not expose containers by default in traefik 2020-11-11 16:45:46 +01:00
Rigel Kent 1a9b141d83
Add nginx behind traefik in docker-compose + image updates
- support/docker/production/docker-compose.yml: addition of a nginx
image reusing support/nginx/peertube nginx conf to improve performance,
and lessen setup differences between the docker-compose install and the
typical production install.
- support/docker/production/docker-compose.yml: postgres 10 -> postgres
12, redis 4 -> redis 5. Postgres major updates implies manual upgrade.
- support/nginx/peertube: HTTP -> HTTPS redirection is now commented
by default, to allow its reuse in support/docker/production/docker-compose.yml.
2020-11-11 16:45:46 +01:00
Chocobozzz b0ce7c39dc
Add ssl support to postgresql 2020-08-24 11:38:57 +02:00
Kim caf2aaf4f9
Add ability to override client assets : logo - favicon - PWA icons - PWA manifest name and description (#2897)
* Add client-overrides storage to config

* Add static-serve for client overrides

* Move backgroun-image logo from bundle to css tag for runtime content hash

* Add dynamic JSON manifest

* Add content hash for manifest, favicon and logo

Co-authored-by: kimsible <kimsible@users.noreply.github.com>
2020-07-10 10:20:11 +02:00
Girish Ramakrishnan 6ee7221117 Add database.name config option
If database.name is set, we use it as the complete database name.
If unset, we use the "peertube"+database.suffix as the complete database
name.

Fixes #1620
2020-06-25 08:48:44 +02:00
Kim 0283fe98b8
fix opendkim permissions in docker-compose setup (#2868)
Co-authored-by: kimsible <kimsible@users.noreply.github.com>
Co-authored-by: Rigel Kent <par@rigelk.eu>
2020-06-12 13:55:40 +02:00
Kim 148ab2f0f0
Fixes docker-compose .env (#2538)
* chore: remove unused var

* fix database name as peertube + update comments

* chore: comment vars indentic to production.yrml

* add smtp comment

* clarify and detail comments

Co-authored-by: kimsible <kimsible@users.noreply.github.com>
2020-05-18 17:50:58 +02:00
Chocobozzz 4fd98756e2
Correctly fix docker storage config 2020-04-02 13:59:01 +02:00
xcffl a3188ba768 Move streaming-playlists to /data 2020-04-02 13:55:58 +02:00
kimsible cd7ec86f5c feat: add dkim to docker-compose 2020-03-11 15:02:13 +01:00
Kim e962e1c3c5
Chore/docker-documentation-improvements (#2494)
* unify env_var names to replace

* detail more and improve docker doc

* fix title

* move acme email and domains to traefik command

* add details about TRAEFIK_ACME_* variables

* Fix preview links from /develop to /master
2020-02-24 15:30:14 +01:00
Chocobozzz 8d3fe90c3f
Add missing ca-certificates in docker image 2020-02-17 10:34:09 +01:00
Kim c5621bd23b
Fix missing python dependency in Dockerfile.buster (#2495)
* Fix missing youtube-dl dependency in buster docker image

* Fix missing python dependency in buster docker image
2020-02-17 10:01:22 +01:00
Chocobozzz 751c8f68ec
Add openssl in docker container 2020-01-27 15:07:01 +01:00
Chocobozzz c82bf36a3f
Docker: stretch -> buster 2019-12-12 09:49:31 +01:00
Ben Lubar 7269868682 Add support for HLS in the Docker container. (#2324)
* Add support for HLS in the Docker container.

* Remove comment from Dockerfile.stretch
2019-12-12 09:41:52 +01:00
Felix Ableitner 244e955e4e Simplify Dockerfile and slim Docker image 2019-12-04 08:43:58 +01:00
Chocobozzz 44daca1f41
Try to fix gitpod 2019-12-03 17:22:25 +01:00
MrGiga 3062112200 Fix For GitPod 2019-11-28 09:22:48 +01:00
Leopere e2882b2ccb Sticking to one env-var management system (#2247)
* Sticking to one env-var management system

Starting with the Postgres container so that you only have to set overlapping environment variables in one place.

* Moving Postfix envvars pt 1

* Moving Postfix envvars pt 2 .env file

* Added missing envvars.

* Adding functioning glue

Suggest something better if you wish.

* removed IP from example

* Removed default network from update.
2019-11-18 09:38:05 +01:00
Chocobozzz f1b3888392
Fix traefik version in docker compose 2019-10-21 11:17:49 +02:00
Chocobozzz 51c3544718
Deprecate Node 8
The support ends on December 2019: https://github.com/nodejs/Release#release-schedule
2019-08-07 12:07:59 +02:00
Chocobozzz 345da516fa WIP plugins: add ability to register plugins 2019-07-24 10:58:16 +02:00
Chocobozzz 297067399d
yarn -> npm in dockerfile 2019-07-08 16:09:13 +02:00
Jacen 7593d9f872 replace npm and apt-get by yarn and apt in dockerfile.stretch (#1952)
* replace npm and apt-get by yarn and apt in dockerfile.stretch

* keep consistancy
2019-07-08 16:07:58 +02:00
Chocobozzz ad3405d087
Improve 4K video quality after transcoding 2019-06-06 14:45:57 +02:00
Felix Ableitner 1bab2bbc11 Fix docker-compose setup so Peertube sees correct IP 2019-05-21 16:59:42 +02:00
Yohan Boniface c342726ad4 Allow to control RATES_LIMIT from configuration (#1787)
* Allow to control RATES_LIMIT from configuration

* @Chocobozzz review (squash me)
2019-04-26 13:48:55 +02:00
Chocobozzz f2e0cca90b
Add host network mode for reverse proxy 2019-04-24 16:28:56 +02:00
Antoine Millet 9c85ee2ed0 Add argument to dockerfile to pass options to npm run build 2019-04-24 16:20:41 +02:00
Jan Keromnes 0cfcbae818 Add automated dev setup using Gitpod 2019-04-12 09:25:43 +02:00
Chocobozzz 31b6ddf866
Add ability to disable tracker 2019-04-10 09:23:18 +02:00
Felix Ableitner b427febb4d Fix problem with SMTP in default docker-compose setup 2019-03-11 09:38:20 +01:00
Chocobozzz 539d3f4faa
BREAKING: update CSP configuration
Disable it by default and add ability to specify a custom report uri
2019-02-21 16:28:53 +01:00
victor héry e902e03f0f Patch docker entrypoint to speed up the chown at startup 2019-01-14 09:04:52 +01:00
Chocobozzz a4101923e6
Implement contact form on server side 2019-01-10 11:32:37 +01:00
Rigel Kent 5e755fff9d add Content Security Policy (#1252)
* add Content Security Policy

* remove reflect-metadata on production builds to get rid of unsafe-eval

* fix baseCSP usage

* add SRI to CSP

* add blob: to media-src

* remove SRI

* CSP set to reportOnly

* adding data: to connect-src CSP

* remove block-all-mixed-content

* add report-uri support
2018-12-13 09:49:45 +01:00
Chocobozzz 14d1b7b95a
Merge branch 'hotfix/docker' into develop 2018-12-06 13:48:46 +01:00
Chocobozzz 73a48728ee
Fix docker build and gosu 2018-12-06 13:48:33 +01:00
Chocobozzz 6040f87d14
Add tmp and redundancy directories 2018-12-04 16:04:15 +01:00
Felix Ableitner fef13f1480 Various improvements for docker-compose 2018-11-21 16:21:42 +01:00
LecygneNoir eff7cdd7b7 Configure docker image to accept trust_proxy as an env variable in json array (#1338) 2018-10-22 19:11:01 +02:00
Kyâne Pichou 4293e362af Improve dev Dockerfile (#1333)
* Improve dev Dockerfile

Use Docker best-practices for the development Dockerfile. Save 3Mo.

* Update support/docker/dev/Dockerfile

Co-Authored-By: pichouk <kyane@kyane.fr>
2018-10-22 14:37:40 +02:00
am97 ee7c25c767 Create new Docker dev image (#1173)
* Move the old dev docker files to support/docker/janitor

* Create new Docker dev image
2018-10-09 17:35:02 +02:00
kaiyou 302e7b19da (docker) search and import settings env variables (#1210) 2018-10-07 15:04:38 +02:00
victor héry ff587059b9 Add possibility to manage trust_proxy list in docker image 2018-09-16 18:50:13 +02:00
kaiyou 6bd9f2f11d (docker) add quota to the docker configuration values (#964) 2018-08-26 11:16:16 +02:00
Chocobozzz 08c11bec43
Fix docker env file 2018-08-14 10:13:17 +02:00
Chocobozzz 904a463c77
Fix dockerfile 2018-08-10 10:37:16 +02:00
Chocobozzz e5095ca55a
Clean yarn cache after install in docker 2018-08-09 19:34:39 +02:00
Chocobozzz e6a3b266f1
Remove unnecessary env variables now we have a .env file 2018-08-08 10:10:21 +02:00
Chocobozzz d1e5922379
Try to reduce docker image size 2018-08-08 10:10:11 +02:00
Chocobozzz 40e87e9ecc Implement captions/subtitles 2018-07-16 11:50:08 +02:00
Chocobozzz 0892f756aa
Add PEERTUBE_SMTP_DISABLE_STARTTLS config docker env 2018-06-27 08:54:36 +02:00
Chocobozzz 6387f320bf
Fix docker compose with admin email 2018-06-21 08:17:42 +02:00
Chocobozzz e8d639b1d7
Fix docker config 2018-06-11 10:09:17 +02:00
Chocobozzz d4d5853e65
Blank instead of null for docker env 2018-06-05 14:04:51 +02:00
Florent Poinsaut 632f9815c6 add the comment from https://github.com/Chocobozzz/PeerTube/pull/617/files#diff-5003d902a2333dfdbcd79d688f2806daL38 2018-06-05 08:47:01 +02:00
Florent Poinsaut f83e339b82 Environment variables for Docker Compose 2018-06-05 08:47:01 +02:00
Rigel Kent 1dd59831f8 (docker) making security settings of traefik on par with nginx 2018-06-04 23:14:26 +02:00
Chocobozzz df9e1d6978
Fix docker config custom env copy 2018-05-30 08:45:34 +02:00
Chocobozzz 18eb286e0b
Cleanup docker configuration 2018-05-30 08:39:44 +02:00
Pierre Jaury 51df0cf3d7 Do not set default transcoding resolutions 2018-05-30 08:33:19 +02:00
Pierre Jaury a4ac1c999e Allow to setup transcoding in the docker image 2018-05-30 08:33:19 +02:00
Chocobozzz 6401417d6c
Add help in conf file regarding SMTP 2018-05-29 10:28:08 +02:00
Chocobozzz 0c985c5a03
Copy custom-environment-variables.yaml on docker startup 2018-05-29 10:04:04 +02:00
Chocobozzz 08806798d0
Add disable_starttls configuration variable for docker 2018-05-28 19:17:32 +02:00
Chocobozzz b44a96300c
Improve docker doc and fix missing keys on update 2018-05-28 11:36:27 +02:00
Jan Keromnes a14d3b6b23 Update Janitor Dockerfile
- Upgrade to newer janitortechnology/ubuntu-dev base image
- Fix workspace folder
- Add Theia port
- Dockerfile best practices
2018-05-17 08:18:56 +02:00
Chocobozzz fd5e57bbe2
Docker config directory as volume 2018-05-07 18:41:10 +02:00
Chocobozzz af111faf77
Fix docker production configuration 2018-05-07 15:26:28 +02:00
Chocobozzz 13a6b53655
Preferably use the docker hub image 2018-05-07 10:51:44 +02:00
Florent Fayolle 4b431d519c Adapt docker image file path in docker-compose.yml 2018-05-07 09:22:18 +02:00
Pierre-Alain TORET cff8b272b1 Support hostname binding in config
* Add basic support for hostname binding

Signed-off-by: Pierre-Alain TORET <pierre-alain.toret@protonmail.com>

* Make production example a bit more secure

Signed-off-by: Pierre-Alain TORET <pierre-alain.toret@protonmail.com>

* Make example config files compatible with hostname binding modification

Signed-off-by: Pierre-Alain TORET <pierre-alain.toret@protonmail.com>

* Fix typo

Signed-off-by: Pierre-Alain TORET <pierre-alain.toret@protonmail.com>

* Bind on 127.0.0.1 by default

Signed-off-by: Pierre-Alain TORET <pierre-alain.toret@protonmail.com>

* Update Docker configuration with hostname binding

Signed-off-by: Pierre-Alain TORET <pierre-alain.toret@protonmail.com>
2018-04-17 11:14:32 +02:00
Chocobozzz c36d5a6b98
Try to fix docker automatic build (again...) 2018-04-16 20:22:42 +02:00
Chocobozzz 33837e8bc2
Try to fix automatic dockerbuild 2018-04-16 19:04:04 +02:00
Chocobozzz 4aeb67a569
Improve dockerfile 2018-04-16 18:44:57 +02:00
Florent Poinsaut f36fb3ecb1 Fix the execution right for docker-entrypoint.sh 2018-04-16 17:26:50 +02:00
Florent Poinsaut 399d20eae6 use gosu to fix /data permissions errors 2018-04-16 09:33:49 +02:00
Florent Poinsaut 2cfd392b58 Add .gitignore for Docker 2018-04-10 22:08:40 +02:00
Chocobozzz 779f000083
Update docker image name 2018-04-03 09:04:35 +02:00
Armando Lüscher 2920281946 Fix little typo in variable. 2018-03-30 08:34:36 +02:00
Chocobozzz 490b595a01
Prevent brute force login attack 2018-03-29 11:03:30 +02:00
Chocobozzz 45cd28b679
Remove alpine image 2018-03-28 13:45:24 +02:00
Angristan c7574e8661 Run the installation as the peertube user inside the Docker image (#385)
* Run the installation as the peertube user

* Run the installation as the peertube user
2018-03-23 14:33:51 +01:00
Chocobozzz 95540ed23a
Prepare building docker files on docker hub 2018-03-23 11:22:26 +01:00
Angristan 95981f6bec Fix data volume path in docker-compose 2018-03-22 18:00:25 +01:00
Chocobozzz bebf2d89d3
Add option to disable starttls 2018-03-22 16:12:52 +01:00
Angristan 0c49373af9 Use {postgres,redis}:alpine images with docker-compose (#372)
* Specify Redis major version
2018-03-22 14:08:55 +01:00
Benjamin Bouvier 3b2ed89181 [docker] Add short_description option in Docker configuration too; (#342) 2018-03-15 16:02:23 +01:00
Benjamin Bouvier ef48a0d50a [docker] Update production guidelines and docker-compose file; (#341) 2018-03-15 14:39:04 +01:00
kaiyou 6500a90cfe Expose SMTP and instance settings in the Docker environment variables (#277) 2018-02-06 08:37:36 +01:00
kaiyou e8395f027b Add production Alpine and Debian Stretch Docker images (#225)
* First pass at a (swarm-compatible) docker image

Uses an existing traefik server as a https reverse proxy.

* Add example config for a Docker swarm deployment

* Point to traefik config for docker compose setup

* Clarify that traefik is needed for the example config

* Use node:8-stretch base image and don't install yarn

(The base image already contains yarn.)

* Initial commit for an Alpine Docker image

* Fix docker volume path

* Merge #213 and #225 and move files around

* Remove unnecessary dependencies from the alpine build

* Update Dockerfiles to match install path, config path, etc.

* Update the configuration in the example compose file

* Update the configuration in the example swarm file

* Remove the declared networks and volumes from the compose example, which are not strictly required

* Update attachment path in the documentation

* Display traefik as a suggestion and not a required dependency

* Update the Docker ignored files

* Fix typos reported in #225

* Move production Dockerfiles to a production directory

* Add the redis configuration settings

* Add Docker files to the dockerignore

* Make the signup limit configurable
2018-01-29 08:52:20 +01:00
Jan Keromnes 897cab462b Pre-build PeerTube again in dev Dockerfile.
PeerTube pre-build was removed in #207 but is still valuable.
2018-01-25 14:48:06 +01:00
Benjamin Bouvier a585af352c Fixes #205: Fix Janitor configuration; 2018-01-25 11:13:07 +01:00