X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=support%2Fdoc%2Fdocker.md;h=1485e7e856bde6724826b6c780efd442bf3e5940;hb=78f912ed5733028ec2bf10c06c19f75b07943be2;hp=3d25d06c46a56c0496a02797628f6a87ad387410;hpb=03ae9d887ae46bef62cfd2b46c1d6b0836bea246;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/support/doc/docker.md b/support/doc/docker.md
index 3d25d06c4..1485e7e85 100644
--- a/support/doc/docker.md
+++ b/support/doc/docker.md
@@ -6,68 +6,72 @@ You can quickly get a server running using Docker. You need to have
 
 ## Production
 
-### Build your own Docker image
-
-```bash
-$ git clone https://github.com/chocobozzz/PeerTube /tmp/peertube
-$ cd /tmp/peertube
-$ docker build . -f ./support/docker/production/Dockerfile.stretch
-```
-
-### Run a preconfigured setup with all dependencies
+### Install
 
 PeerTube needs a PostgreSQL and a Redis instance to work correctly. If you want
 to quickly set up a full environment, either for trying the service or in
 production, you can use a `docker-compose` setup.
 
-```bash
-$ git clone https://github.com/chocobozzz/PeerTube /tmp/peertube
-$ cd /tmp/peertube/support/docker/production
+```shell
+$ cd /your/peertube/directory
+$ mkdir ./docker-volume && mkdir ./docker-volume/traefik
+$ curl "https://raw.githubusercontent.com/chocobozzz/PeerTube/master/support/docker/production/config/traefik.toml" > ./docker-volume/traefik/traefik.toml
+$ touch ./docker-volume/traefik/acme.json && chmod 600 ./docker-volume/traefik/acme.json
+$ curl -s "https://raw.githubusercontent.com/chocobozzz/PeerTube/master/support/docker/production/docker-compose.yml" -o docker-compose.yml "https://raw.githubusercontent.com/Chocobozzz/PeerTube/master/support/docker/production/.env" -o .env
 ```
 
-Then tweak the `docker-compose.yml` file there according to your needs. Then
-you can use the regular `up` command to set it up, with possible overrides of
-the environment variables:
-
-```bash
-$ PEERTUBE_HOSTNAME=peertube.lvh.me \
-  PEERTUBE_ADMIN_EMAIL=test@example.com \
-  PEERTUBE_TRANSCODING_ENABLED=true \
-  PEERTUBE_SIGNUP_ENABLED=true \
-  PEERTUBE_SMTP_HOST=mail.lvh.me \
-  PEERTUBE_SMTP_PORT=1025 \
-  PEERTUBE_SMTP_FROM=noreply@peertube.lvh.me \
-    docker-compose up
+Update the reverse proxy configuration:
+
+```shell
+$ vim ./docker-volume/traefik/traefik.toml
 ```
 
-Other environment variables are used in
-`support/docker/production/config/custom-environment-variables.yaml` and can be
-intuited from usage.
+Tweak the `docker-compose.yml` file there according to your needs:
 
-For this example configuration, a reverse proxy is quite recommended. The
-example Docker Compose file provides example labels for a Traefik load
-balancer, although any HTTP reverse proxy will work fine. See the example
-Nginx configuration `support/nginx/peertube` file to get an idea of
-recommendations and requirements to run PeerTube the most efficiently.
+```shell
+$ vim ./docker-compose.yaml
+```
 
-When starting the containers for the first time, you will get permissions errors for the data volume, like this one:
+Then tweak the `.env` file to change the enviromnent variables:
 
-```
-Error: EACCES: permission denied, mkdir '/data/logs'
+```shell
+$ vim ./.env
 ```
 
-The peertube user inside the container has a UID and GID of 991 so you have to change the folder's owner, in the case you're using `./data`:
+Other environment variables are used in
+`support/docker/production/config/custom-environment-variables.yaml` and can be
+intuited from usage.
 
-```
-chown -R 991:991 data/
+You can use the regular `up` command to set it up:
+
+```shell
+$ docker-compose up
 ```
 
 **Important**: note that you'll get the initial `root` user password from the
 program output, so check out your logs to find them.
 
+### Upgrade
+
+Pull the latest images and rerun PeerTube:
+
+```shell
+$ cd /your/peertube/directory
+$ docker-compose down
+$ docker-compose pull
+$ docker-compose up -d
+```
+
+
+## Build your own Docker image
+
+```shell
+$ git clone https://github.com/chocobozzz/PeerTube /tmp/peertube
+$ cd /tmp/peertube
+$ docker build . -f ./support/docker/production/Dockerfile.stretch
+```
+
 ## Development
 
-The Docker image that's preconfigured in `support/docker/dev` contains all the
-services embedded in one image, so as to work correctly on
-[Janitor](https://janitor.technology). It is much not advised to use it in
-production.
+We don't have a Docker image for development. See [the CONTRIBUTING guide](https://github.com/Chocobozzz/PeerTube/blob/develop/.github/CONTRIBUTING.md#develop)
+for more information on how you can hack PeerTube!