Chore/docker-documentation-improvements

[kimsible]

This an update /support/docker/production/.env file example since the recent changes of environment variables (#2247) in the release v2.1.

Also, more details and some improvements for the docker documentation /support/doc/docker.md to simplify the installation, some parts were unclear for non-familiar with docker-compose and traefik : https://github.com/kimsible/PeerTube/blob/chore/improve-docker-documentation/support/doc/docker.md

Plus, it moves ACME email and domain list from /support/docker/production/config/traefik.toml to /support/docker/production/.env and /support/docker/production/docker-compose.yml as a command of traefik service.

[kimsible]

Thanks for adding the labels @rigelk.

I also wonder if ./docker-volume/traefik/traefik.toml could be placed in ./docker-volume/config/traefik.toml as it is provided by the peertube docker image chocobozzz/peertube:production-buster and as the [acme] email and [[acme.domains]] configurations lines have been dropped and now defined as a traefik command in docker-compose.yml

services:
  reverse-proxy:
    volumes:
      [...]
      - ./docker-volume/traefik/acme.json:/etc/acme.json
      - ./docker-volume/traefik/traefik.toml:/traefik.toml

Also, for ./docker-volume/traefik/acme.json, is it really usefull to link it as a volume in docker-compose.yml ? I mean, docker will not erase it inside the traefik container (/etc/acme.json) until it is recreated.

If I don't miss anything it could simplify more the configuration.

[Chocobozzz]

Thanks for the PR. Could you fix the conflict please?

[kimsible]

Ok thanks @Chocobozzz for replying to my first comment in the issue #2304.

Here .env has minor changes to make documentation clearer, as it is the main file to configure.
I see it as an example file.

For the extrating of [acme] email and [[acme.domains]] of ./docker-volume/traefik/traefik.toml to .env / docker-compose.yml, it is more to follow the recent changes of the v2.1, to unify main env var in the same file .env.

In my opinion, some environement variables should have been left in docker-compose.yml (POSTGRES and POSTFIX) but I suppose they've been extracted to make docker-compose.yml simpler to maintain.

[LecygneNoir]

Hello,

I have just noticed (already present in the old doc it seems) that the files used for "preview" are different from the files downloaded.

Indeed, to download with curl, you use /master/, but for the link to the previews, you use /develop/

I guess we should use /master/ for all?

Could you fix it in the PR before merging? (Else I may create a new PR once this one is merged ^^)

Anyway, thanks for the improvements! 👍

[rigelk]

Indeed, to download with curl, you use /master/, but for the link to the previews, you use /develop/ […] I guess we should use /master/ for all?

I personally don't understand why you don't use relative references, since you are already in the peertube directory. You don't need to curl these files, you can just edit them locally. The same goes for links: you replace local references with references to the github.

[LecygneNoir]

I personally don't understand why you don't use relative references, since you are already in the peertube directory. You don't need to curl these files, you can just edit them locally. The same goes for links: you replace local references with references to the github.

Nope, do not forgot it's a docker usage, so in this documentation you curl the file. You cannot assume the entire git repo has been cloned, as ideally, you just need the docker-compose and some config files and the docker image do all the "app" job for you.

The main advantage of using docker is to avoid cloning and building the app manually.

So, you need to curl the files as you do not have them locally if you have not git cloned the repo :)
Or I am totally misunderstanding your answer sorry 😅

The previous version of the doc also link to the github (and to the /develop/ instead of /master/):

View the source of the files you're about to download: [docker-compose.yml](https://github.com/Chocobozzz/PeerTube/blob/develop/support/docker/production/docker-compose.yml) and the [traefik.toml](https://github.com/Chocobozzz/PeerTube/blob/develop/support/docker/production/config/traefik.toml) and the [.env](https://github.com/Chocobozzz/PeerTube/blob/develop/support/docker/production/.env)

My point was, for the curl part and the View the source of the file you're about to download: we should use same URL, as long as we continue to provide these 2 lines in doc.

Valid only if we keep both lines, which I think we should (one should always look at what he download)

[rigelk]

ah, I see. Thanks for putting that into context @LecygneNoir.

[kimsible]

I have just noticed (already present in the old doc it seems) that the files used for "preview" are different from the files downloaded.
Indeed, to download with curl, you use /master/, but for the link to the previews, you use /develop/

Thanks for the review @LecygneNoir and @rigelk, it's fixed.