Merge branch 'develop' into stable

[akkoma] / docs / docs / installation / docker_en.md

diff --git a/docs/docs/installation/docker_en.md b/docs/docs/installation/docker_en.md
index ecb9276499216490b5c72a225aa03e1fd66fc35f..2a3b3d161a1b7c8d3c740b781e26ca4f45155e46 100644 (file)
--- a/docs/docs/installation/docker_en.md
+++ b/docs/docs/installation/docker_en.md
@@ -6,6 +6,8 @@ This guide will show you how to get akkoma working in a docker container,
 if you want isolation, or if you run a distribution not supported by the OTP
 releases.
 
+If you want to migrate from or OTP to docker, check out [the migration guide](./migrating_to_docker_en.md).
+
 ### Prepare the system
 
 * Install docker and docker-compose
@@ -43,16 +45,14 @@ in our compose environment.
 
 ```bash
 mkdir pgdata
-# if you want to use caddy
-mkdir caddy-data
-mkdir caddy-config
 ./docker-resources/manage.sh mix deps.get
 ./docker-resources/manage.sh mix compile
 ./docker-resources/manage.sh mix pleroma.instance gen
 ```
 
 This will ask you a few questions - the defaults are fine for most things,
-the database hostname is `db`, and you will want to set the ip to `0.0.0.0`.
+the database hostname is `db`, the database password is `akkoma`
+(not auto generated), and you will want to set the ip to `0.0.0.0`.
 
 Now we'll want to copy over the config it just created
 
@@ -118,6 +118,8 @@ You've got two options.
 This is by far the easiest option. It'll handle HTTPS and all that for you. 
 
 ```bash
+mkdir caddy-data
+mkdir caddy-config
 cp docker-resources/Caddyfile.example docker-resources/Caddyfile
 ```
 
@@ -150,7 +152,7 @@ git pull
 ./docker-resources/manage.sh mix deps.get
 ./docker-resources/manage.sh mix compile
 ./docker-resources/manage.sh mix ecto.migrate
-docker-compose restart akkoma
+docker-compose restart akkoma db
 ```
 
 #### Further reading