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

Merge branch 'libmagic' into 'develop'

Add missing libmagic for image upload to dockerfile

See merge request pleroma/pleroma!3168
---

a65fc78c6a14e1333ce71d28824a490a8a6da69b
diff --combined Dockerfile
index a1dc9d050,6a328c88a..b1b5171af
--- a/Dockerfile
+++ b/Dockerfile
@@@ -4,7 -4,7 +4,7 @@@ COPY . 
  
  ENV MIX_ENV=prod
  
 -RUN apk add git gcc g++ musl-dev make &&\
 +RUN apk add git gcc g++ musl-dev make cmake file-dev &&\
  	echo "import Mix.Config" > config/prod.secret.exs &&\
  	mix local.hex --force &&\
  	mix local.rebar --force &&\
@@@ -33,7 -33,7 +33,7 @@@ ARG DATA=/var/lib/plerom
  
  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 &&\