8 commits

Author	SHA1	Message	Date
Pierre Jaury	16dc76db17	Merge branch 'dev' of https://github.com/dansup/pixelfed into dev	2018-08-13 15:59:39 +02:00
Angristan	e170830aca	Provide at least a major version of redis for the docker image ... Considering Redis 5 is currently in RC, it would be safer to provide at least a major version of Redis, even if there is not compatibility issue yet.	2018-07-22 19:15:49 +02:00
Pierre Jaury	cce25eb771	Use environment variables only (no .env file) and separate horizon	2018-06-17 11:04:38 +02:00
Pierre Jaury	4998830fa1	Update the docker compose to use the apache image	2018-06-16 22:31:16 +02:00
Moritz Heiber	1fec673728	Replaced docker-compose.yml, run composer as root, create needed directories for application storage, revert changes to nginx.conf	2018-05-31 21:43:14 +02:00
Moritz Heiber	5117f003fe	Revert the changes to the docker-compose.yml, we can merge the files later if necessary	2018-05-29 12:30:50 +02:00
Moritz Heiber	609ca40e69	Tweaked the Docker configuration	2018-05-29 10:28:19 +02:00
kpcyrd	77ca794cf0	Add simple docker deployment	2018-05-20 15:02:29 +02:00