Merge remote-tracking branch 'origin/master'

This commit is contained in:
Patrik J. Braun 2020-01-07 22:49:04 +01:00
commit 0783acc9e5

View File

@ -41,7 +41,7 @@ Download [docker-compose/default/docker-compose.yml](docker-compose/default/dock
Edit `docker-compose.yml` to point the volumes to the right `image` and `tmp` directories. Edit `docker-compose.yml` to point the volumes to the right `image` and `tmp` directories.
Edit `nginx.conf` by replacing `yourdomain.com` to you domain address. Edit `nginx.conf` by replacing `yourdomain.com` to you domain address.
**Note**: Do not change the `image` and the `tmp` path in the `config.json` or in the UI, only through the `volume` settings of the docker. see [here](https://github.com/bpatrik/pigallery2/issues/114#issuecomment-570006336) **Note**: Do not change the `image` and the `tmp` path in the `config.json` or in the UI, only through the `volume` settings of the docker. See [here](https://github.com/bpatrik/pigallery2/issues/114#issuecomment-570006336) and [here](https://github.com/bpatrik/pigallery2/issues/119).
**Note:** We are using nginx as reverse proxy to handle https and do proper HTTP queuing, gzipping, etc. Full nginx-based docker-compose tutorial [here](https://www.domysee.com/blogposts/reverse-proxy-nginx-docker-compose). **Note:** We are using nginx as reverse proxy to handle https and do proper HTTP queuing, gzipping, etc. Full nginx-based docker-compose tutorial [here](https://www.domysee.com/blogposts/reverse-proxy-nginx-docker-compose).
@ -92,6 +92,8 @@ After the container is up and running, you go to `http://localhost` and log in w
**Note**: even with `memory` db, pigallery2 creates a db file for storing user credentials (if enabled), so mounting (with `-v`) the `/app/data/db` folder is recommended. **Note**: even with `memory` db, pigallery2 creates a db file for storing user credentials (if enabled), so mounting (with `-v`) the `/app/data/db` folder is recommended.
**Note2**: Do not change the `image` and the `tmp` path in the `config.json` or in the UI, only through the `volume` settings of the docker. See [here](https://github.com/bpatrik/pigallery2/issues/114#issuecomment-570006336) and [here](https://github.com/bpatrik/pigallery2/issues/119).
### II.a before v1.7.0 ### II.a before v1.7.0
There was a breaking change in Docker files after v1.7.0. Use this to run earlier versions: There was a breaking change in Docker files after v1.7.0. Use this to run earlier versions: