Merge branch 'dockerfile-touchups' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Wed, 4 Sep 2019 20:22:41 +0000 (20:22 +0000)
committerrinpatch <rinpatch@sdf.org>
Wed, 4 Sep 2019 20:22:41 +0000 (20:22 +0000)
commit3b8d64ee24053638aa22f67ced1367c8666b9fa0
tree8e27b98e897a7111413a7bb6263543bde0a59228
parente72531bfacb2399ad0783a26b1c23f0bba24a107
parent053b17f57ecd9e1c3f82118e2a5e5c3b2937969d
Merge branch 'dockerfile-touchups' into 'develop'

Update Dockerfile + some touchups to docker.exs

See merge request pleroma/pleroma!1624