Merge master into federation #48

Manually merged
nutomic merged 120 commits from merge-master into federation 2020-06-09 18:07:02 +00:00
1 changed files with 3 additions and 1 deletions
Showing only changes of commit 8257b040be - Show all commits

View File

@ -1,4 +1,4 @@
version: '3.3'
version: '2.2'
services:
postgres:
@ -32,6 +32,7 @@ services:
volumes:
- ./volumes/pictshare:/usr/share/nginx/html/data
restart: always
mem_limit: 100m
iframely:
image: dogbin/iframely:latest
@ -40,3 +41,4 @@ services:
volumes:
- ./iframely.config.local.js:/iframely/config.local.js:ro
restart: always
mem_limit: 100m