diff --git a/support/doc/docker.md b/support/doc/docker.md index 78a8d2d32..066451067 100644 --- a/support/doc/docker.md +++ b/support/doc/docker.md @@ -64,7 +64,8 @@ intuited from usage. #### Webserver ::: info -The docker compose file includes a configured web server. You can skip this part and comment the appropriate section in the docker compose if you use another webserver/proxy.::: +The docker compose file includes a configured web server. You can skip this part and comment the appropriate section in the docker compose if you use another webserver/proxy. +::: Install the template that the nginx container will use. The container will generate the configuration by replacing `${WEBSERVER_HOST}` and `${PEERTUBE_HOST}` using your docker compose env file. @@ -91,20 +92,20 @@ _note_: Newer versions of compose are called with `docker compose` instead of `d Run your containers: ```shell -docker-compose up +docker compose up ``` #### Obtaining your automatically-generated admin credentials You can change the automatically created password for user root by running this command from peertube's root directory: ```shell -docker-compose exec -u peertube peertube npm run reset-password -- -u root +docker compose exec -u peertube peertube npm run reset-password -- -u root ``` You can also grep your peertube container's logs for the default `root` password. You're going to want to run `docker-compose logs peertube | grep -A1 root` to search the log output for your new PeerTube's instance admin credentials which will look something like this. ```bash -docker-compose logs peertube | grep -A1 root +docker compose logs peertube | grep -A1 root peertube_1 | [example.com:443] 2019-11-16 04:26:06.082 info: Username: root peertube_1 | [example.com:443] 2019-11-16 04:26:06.083 info: User password: abcdefghijklmnop @@ -142,19 +143,19 @@ Pull the latest images: ```shell cd /your/peertube/directory -docker-compose pull +docker compose pull ``` Stop, delete the containers and internal volumes (to invalidate static client files shared by `peertube` and `webserver` containers): ```shell -docker-compose down -v +docker compose down -v ``` Rerun PeerTube: ```shell -docker-compose up -d +docker compose up -d ``` ## Build