From: feld <feld@feld.me>
Date: Sat, 21 Nov 2020 18:11:58 +0000 (+0000)
Subject: Merge branch 'libmagic' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=22f85e05703fc3e084f76fb9c00573046439c4ce;p=akkoma

Merge branch 'libmagic' into 'develop'

Add missing libmagic for image upload to dockerfile

See merge request pleroma/pleroma!3168

(cherry picked from commit a65fc78c6a14e1333ce71d28824a490a8a6da69b)

e6af7dc7 Add missing libmagic for image upload
---

diff --git a/Dockerfile b/Dockerfile
index aa50e27ec..82bd8519c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,7 +33,7 @@ ARG DATA=/var/lib/pleroma
 
 RUN echo "http://nl.alpinelinux.org/alpine/latest-stable/community" >> /etc/apk/repositories &&\
 	apk update &&\
-	apk add exiftool imagemagick ncurses postgresql-client &&\
+	apk add exiftool imagemagick libmagic ncurses postgresql-client &&\
 	adduser --system --shell /bin/false --home ${HOME} pleroma &&\
 	mkdir -p ${DATA}/uploads &&\
 	mkdir -p ${DATA}/static &&\