Fixing docker install instructions for pictshare. #831

[lemmy.git] / docs / src / administration_install_docker.md

diff --git a/docs/src/administration_install_docker.md b/docs/src/administration_install_docker.md
index 64abe737e0e16a77eebc4dcd8d40bf80f90af7ce..05ec8ab30b7df0bcd121cea9e65687251424c3d0 100644 (file)
--- a/docs/src/administration_install_docker.md
+++ b/docs/src/administration_install_docker.md
@@ -1,26 +1,39 @@
-Make sure you have both docker and docker-compose(>=`1.24.0`) installed:
+# Docker Installation
+
+Make sure you have both docker and docker-compose(>=`1.24.0`) installed. On Ubuntu, just run `apt install docker-compose docker.io`. Next, 
 
 ```bash
-mkdir lemmy/
-cd lemmy/
+# create a folder for the lemmy files. the location doesnt matter, you can put this anywhere you want
+mkdir /lemmy
+cd /lemmy
+
+# download default config files
 wget https://raw.githubusercontent.com/dessalines/lemmy/master/docker/prod/docker-compose.yml
 wget https://raw.githubusercontent.com/dessalines/lemmy/master/docker/lemmy.hjson
-# Edit lemmy.hjson to do more configuration
-docker-compose up -d
+wget https://raw.githubusercontent.com/dessalines/lemmy/master/docker/iframely.config.local.js
+
+# Set correct permissions for pictrs folder
+mkdir -p volumes/pictrs
+sudo chown -R 991:991 volumes/pictrs
 ```
 
-and go to http://localhost:8536.
+After this, have a look at the [config file](administration_configuration.md) named `lemmy.hjson`, and adjust it, in particular the hostname, and possibly the db password. Then run:
 
-[A sample nginx config](/ansible/templates/nginx.conf), could be setup with:
+`docker-compose up -d`
+
+To make Lemmy available outside the server, you need to setup a reverse proxy, like Nginx. [A sample nginx config](https://raw.githubusercontent.com/dessalines/lemmy/master/ansible/templates/nginx.conf), could be setup with:
 
 ```bash
 wget https://raw.githubusercontent.com/dessalines/lemmy/master/ansible/templates/nginx.conf
 # Replace the {{ vars }}
 sudo mv nginx.conf /etc/nginx/sites-enabled/lemmy.conf
 ```
-#### Updating
 
-To update to the newest version, run:
+You will also need to setup TLS, for example with [Let's Encrypt](https://letsencrypt.org/). After this you need to restart Nginx to reload the config.
+
+## Updating
+
+To update to the newest version, you can manually change the version in `docker-compose.yml`. Alternatively, fetch the latest version from our git repo:
 
 ```bash
 wget https://raw.githubusercontent.com/dessalines/lemmy/master/docker/prod/docker-compose.yml