From 85ae729151173807114623c1e02c8c763e07cc01 Mon Sep 17 00:00:00 2001
From: ruvilonix <114708614+ruvilonix@users.noreply.github.com>
Date: Sun, 12 Feb 2023 00:14:14 +0000
Subject: [PATCH] Update docker.md

1. I don't know if you're supposed to do something other than enter `$EDITOR ./docker-compose.yml` into terminal, but when I did that it gave a permission error, so I just used nano. Same with `.env`.

2. Newer versions of Docker Compose use the command `docker compose`, not `docker-compose`.

3. Grepping the password from logs was not working. I looked at the full logs, and I didn't see anything about a password. I added how to set a custom password. Maybe the grepping part should be removed or changed to make it work.
---
 support/doc/docker.md | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/support/doc/docker.md b/support/doc/docker.md
index b6990f3e3..6fc443c8e 100644
--- a/support/doc/docker.md
+++ b/support/doc/docker.md
@@ -35,13 +35,13 @@ View the source of the file you're about to download: [.env](https://github.com/
 #### Tweak the `docker-compose.yml` file there according to your needs
 
 ```shell
-$EDITOR ./docker-compose.yml
+sudo nano docker-compose.yml
 ```
 
 #### Then tweak the `.env` file to change the environment variables settings
 
 ```shell
-$EDITOR ./.env
+sudo nano .env
 ```
 
 In the downloaded example [.env](https://github.com/Chocobozzz/PeerTube/blob/master/support/docker/production/.env), you must replace:
@@ -79,6 +79,8 @@ A dedicated container in the docker-compose will automatically renew this certif
 
 #### Test your setup
 
+_note_: Newer versions of compose are called with `docker compose` instead of `docker-compose`, so remove the dash in all steps that use this command if you are getting errors.
+
 Run your containers:
 
 ```shell
@@ -87,7 +89,12 @@ docker-compose up
 
 #### Obtaining your automatically-generated admin credentials
 
-Now that you've installed your PeerTube instance you'll want to grep your peertube container's logs for the `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.
+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
+```
+
+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
-- 
2.41.0