Prepare for new docker#152

shleeable wants to merge 2 commits intopixelfed:mainpixelfed/docs:mainfrom

shleeable:mainshleeable/docs:mainCopy head branch name to clipboard