barrucadu authored Nov 12, 2020 and feld committed Nov 21, 2020

This is required by the majic, added in #2534.

Add missing libmagic for image upload to dockerfile

See merge request !3168

(cherry picked from commit a65fc78c)

e6af7dc7 Add missing libmagic for image upload

Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"

See merge request !3158

(cherry picked from commit 8a7ee9fe)

42ff5ea9 Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"

This reverts merge request !2955

This is required by the majic, added in #2534.

We really only want to strip location data anyway, and mogrify strips color profiles.

Just merging RUNs to decrease the number of layers

At this point, the implementation is completely working and has been
tested running live and federating with other instances.

No fancy script or minit automatic migration, etc, but if you start
the docker image and go in and manually do everything, it works.