From: rinpatch <rinpatch@sdf.org>
Date: Wed, 4 Sep 2019 20:22:41 +0000 (+0000)
Subject: Merge branch 'dockerfile-touchups' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=3b8d64ee24053638aa22f67ced1367c8666b9fa0;p=akkoma

Merge branch 'dockerfile-touchups' into 'develop'

Update Dockerfile + some touchups to docker.exs

See merge request pleroma/pleroma!1624
---

3b8d64ee24053638aa22f67ced1367c8666b9fa0